ENH: Added better error handling
ENH: Added better error handling

jcfr/CDash,cpatrick/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash