improved catchall to avoid not sending response