Fix InvalidRequest Handling