Fix response time
Clean up try/catch