Tweaking error handling to help diagnose #44