OC-5826
Checking in code for updates to Error messages