Improved error handling, and a little logging