--- old/src/share/vm/gc/g1/satbMarkQueue.cpp	2017-04-25 16:44:47.015174774 +0200
+++ new/src/share/vm/gc/g1/satbMarkQueue.cpp	2017-04-25 16:44:46.879174779 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/satbMarkQueue.hpp"
 #include "gc/shared/collectedHeap.hpp"
@@ -39,7 +40,7 @@
   // created during a cycle and its SATB queue needs to be activated
   // before the thread starts running, we'll need to set its active
   // field to true. This is done in JavaThread::initialize_queues().
-  PtrQueue(qset, permanent, false /* active */)
+  PtrQueue(qset != NULL ? qset : &G1BarrierSet::satb_mark_queue_set(), permanent, false /* active */)
 { }
 
 void SATBMarkQueue::flush() {