--- old/src/share/vm/gc/serial/genMarkSweep.cpp	2015-10-08 22:15:42.670423359 +0200
+++ new/src/share/vm/gc/serial/genMarkSweep.cpp	2015-10-08 22:15:42.620424553 +0200
@@ -173,7 +173,7 @@
 
 
 void GenMarkSweep::deallocate_stacks() {
-  if (!UseG1GC) {
+  if (!UseG1GC  && !UseShenandoahGC) {
     GenCollectedHeap* gch = GenCollectedHeap::heap();
     gch->release_scratch();
   }