Getting ready for a CRAN resubmit for better error handling.