Fixing exception mapping so the client can read custom headers