improve 404 and 500 responses