b8ed3ea Improve error handling in image-load, etc