Fix error catchers on server

[Ian-Bright]

We need to fix the error catchers on the server otherwise we have no way of returning an explicit error message from the authentication guard. This may not work with the current error handling mechanism we've set up