Some small edits to the error handling.