diff --git a/lib/_debugger.js b/lib/_debugger.js
index 802e2da1e6..6be3fa55b8 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -119,7 +119,7 @@ function Client() {
   this._reqCallbacks = [];
   var socket = this;
 
-  this.currentFrame = NO_FRAME;
+  this.currentFrame = 0;
   this.currentSourceLine = -1;
 
   // Note that 'Protocol' requires strings instead of Buffers.
diff --git a/src/node.cc b/src/node.cc
index d81aab841a..c349afb8dd 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1960,7 +1960,7 @@ static void HandleDebugEvent(DebugEvent event,
   // TODO probably need to waitpid here or something to avoid zombies.
   // int status;
   // waitpid(pid, &status, 0);
-  Debug::DebugBreak();
+  //Debug::DebugBreak();
 }