Fixed InternalServerError catching