Minor error reporting improvements