Begin adding better error handling.