--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java	2017-07-07 09:31:36.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java	2017-07-07 09:31:36.000000000 -0700
@@ -26,7 +26,6 @@
 import java.util.List;
 
 import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.Debug;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.GraalGraphError;
 import org.graalvm.compiler.graph.Node;
@@ -290,7 +289,7 @@
             ReentrantBlockIterator.apply(closure, schedule.getCFG().getStartBlock());
 
         } catch (Throwable t) {
-            Debug.handle(t);
+            graph.getDebug().handle(t);
         }
         return true;
     }