Using correct error message code for - TRUNK-4044