--- old/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java	2018-04-10 11:23:49.591339998 -0700
+++ new/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java	2018-04-10 11:23:49.371340097 -0700
@@ -199,7 +199,7 @@
             PAIR = l.findVarHandle(AtomicStampedReference.class, "pair",
                                    Pair.class);
         } catch (ReflectiveOperationException e) {
-            throw new Error(e);
+            throw new ExceptionInInitializerError(e);
         }
     }