refactoring error message handling - 4 - continued