Fixed bug for WB-9005. Modified error messages.