BS-9612 Fix errormessage behavior post merge