Catch other errors we throw in guard clauses

Catch other errors we throw in guard clauses so we pass the error details on to the client