Cleaned up error message handling.
2 files changed