[DCSSW-175] refactored error messages a bit