#208 better null handling when reading cookies

tmenier · Sep 3, 2017 · 45f5514 · 45f5514
1 parent 8556164
commit 45f5514
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Flurl.Http/FlurlRequest.cs b/src/Flurl.Http/FlurlRequest.cs
@@ -161,9 +161,9 @@ private void WriteRequestCookies(HttpRequestMessage request) {
 		}
 
 		private void ReadResponseCookies(HttpResponseMessage response) {
-			if (response?.RequestMessage == null) return;
-
-			var uri = response.RequestMessage.RequestUri;
+			var uri = response?.RequestMessage?.RequestUri;
+			if (uri == null)
+				return;
 
 			// if the handler is an HttpClientHandler (which it usually is), it's already plucked the
 			// cookies out of the headers and put them in the CookieContainer.