--- old/src/cpu/x86/vm/templateTable_x86.cpp	2017-03-12 11:11:15.438864707 +0100
+++ new/src/cpu/x86/vm/templateTable_x86.cpp	2017-03-12 11:11:15.378864968 +0100
@@ -216,6 +216,7 @@
       }
       break;
     case BarrierSet::ModRef:
+    case BarrierSet::Epsilon:
       if (val == noreg) {
         __ store_heap_oop_null(obj);
       } else {