fixed error messages
#DCS-23: refactoring