Error reporting improvements.
2 files changed