Modified bad request to return correct message