--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Tue Apr 10 11:33:29 2018 -0700
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Tue Apr 10 11:37:18 2018 -0700
@@ -2883,7 +2883,7 @@
             STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
             NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to