--- old/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java	2018-04-10 11:23:50.919339400 -0700
+++ new/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java	2018-04-10 11:23:50.727339486 -0700
@@ -1830,7 +1830,7 @@
             HEAD = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "head", Node.class);
             TAIL = l.findVarHandle(AbstractQueuedLongSynchronizer.class, "tail", Node.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
 
         // Reduce the risk of rare disastrous classloading in first call to