Added in custom exceptions
Merge branch 'error_handler' into develop