HR-361 Address error messages