Improve the catch all response case