Hrmpf. More error handling for #57