Follow the header conventions from Hawk
Handle more generic exceptions
Fix the error messages