--- a/src/share/vm/utilities/exceptions.cpp	Mon Feb 27 17:06:18 2012 +0100
+++ b/src/share/vm/utilities/exceptions.cpp	Mon Feb 27 18:31:27 2012 +0100
@@ -95,8 +95,10 @@
 #endif // ASSERT
 
   if (thread->is_VM_thread()
-	  // TODO(tw): May we do this?
-      /*|| thread->is_Compiler_thread()*/ ) {
+#ifndef GRAAL
+      || thread->is_Compiler_thread()
+#endif
+    ) {
     // We do not care what kind of exception we get for the vm-thread or a thread which
     // is compiling.  We just install a dummy exception object
     thread->set_pending_exception(Universe::vm_exception(), file, line);
@@ -119,8 +121,10 @@
   }
 
   if (thread->is_VM_thread()
-	  // TODO(tw): May we do this?
-     /* || thread->is_Compiler_thread()*/ ) {
+#ifndef GRAAL
+      || thread->is_Compiler_thread()
+#endif
+    ) {
     // We do not care what kind of exception we get for the vm-thread or a thread which
     // is compiling.  We just install a dummy exception object
     thread->set_pending_exception(Universe::vm_exception(), file, line);