Improve error handling
A bundle of minor error-handling improvements done while debugging to facilitate easier locating of error sources.
A bundle of minor error-handling improvements done while debugging to facilitate easier locating of error sources.