Handling cancelled requests better