--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java	Thu Nov 16 12:15:55 2017 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java	Thu Nov 16 19:56:44 2017 +0000
@@ -51,6 +51,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -104,7 +105,8 @@
     }
 
     public static Throwable getCompletionCause(Throwable x) {
-        if (!(x instanceof CompletionException)) return x;
+        if (!(x instanceof CompletionException)
+                && !(x instanceof ExecutionException)) return x;
         final Throwable cause = x.getCause();
         return cause == null ? x : cause;
     }