Merge "not catching all exceptions when invalid request"