diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index dbe23aab931b4a35a98969fa2f9ae80b6e7fb723..5765b518da230f23c7715b330ad7fea227af9a6f 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -170,8 +170,8 @@ void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
 
     if (status == QDeclarativeDebugClient::Enabled) {
         d->m_qmlClient = d->debugClients.value(serviceName);
-        d->m_qmlClient->connect();
         d->m_qmlClient->flushSendBuffer();
+        d->m_qmlClient->startSession();
     }
 }
 
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.h b/src/plugins/debugger/qml/qmldebuggerclient.h
index 69ceb86fc7d23667cb3b76104f542308cc650f56..a9a8682c82da4ccdafaf97b8d98ff2a81150da89 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.h
+++ b/src/plugins/debugger/qml/qmldebuggerclient.h
@@ -52,8 +52,8 @@ public:
     QmlDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client, QLatin1String clientName);
     virtual ~QmlDebuggerClient();
 
-    virtual void connect() = 0;
-    virtual void disconnect() = 0;
+    virtual void startSession() = 0;
+    virtual void endSession() = 0;
 
     virtual void executeStep() = 0;
     virtual void executeStepOut() = 0;
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index ebdbbb4e057afc0dd4b97d2cfd6807d144fbdf35..f65d8d2f17878bf78cdb72cd18680e95fa2351fa 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -375,7 +375,7 @@ void QmlEngine::handleRemoteSetupFailed(const QString &message)
 
 void QmlEngine::shutdownInferior()
 {
-    d->m_adapter.activeDebuggerClient()->disconnect();
+    d->m_adapter.activeDebuggerClient()->endSession();
 
     if (isSlaveEngine()) {
         resetLocation();
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 157c028c6a66ccc751ebaf4f03db5a0ae3a66e00..692c080d049079938f493fbf8ff7f19a913eb5c5 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -192,7 +192,7 @@ void QmlV8DebuggerClient::interruptInferior()
 
 }
 
-void QmlV8DebuggerClient::connect()
+void QmlV8DebuggerClient::startSession()
 {
     QByteArray request;
 
@@ -204,7 +204,7 @@ void QmlV8DebuggerClient::connect()
     sendMessage(packMessage(request));
 }
 
-void QmlV8DebuggerClient::disconnect()
+void QmlV8DebuggerClient::endSession()
 {
     QByteArray request;
 
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.h b/src/plugins/debugger/qml/qmlv8debuggerclient.h
index 70c0fec0557bd00987ce24c1133ee717d4ba1ecb..04aeec17627b739b84fa6baa299ccfe18a271c5e 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.h
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.h
@@ -52,8 +52,8 @@ public:
     explicit QmlV8DebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
     ~QmlV8DebuggerClient();
 
-    void connect();
-    void disconnect();
+    void startSession();
+    void endSession();
 
     void executeStep();
     void executeStepOut();
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 755485200ec860f0a5e10b1b3e2c6d596af1c539..03bc3bd9ce05bef24b65a5a6f18a5fed911ac568 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -192,11 +192,17 @@ void QScriptDebuggerClient::interruptInferior()
     sendMessage(reply);
 }
 
-void QScriptDebuggerClient::connect()
+void QScriptDebuggerClient::startSession()
 {
+    //Set all breakpoints
+    BreakHandler *handler = d->engine->breakHandler();
+    foreach (BreakpointModelId id, handler->engineBreakpointIds(d->engine)) {
+        QTC_ASSERT(handler->state(id) == BreakpointInsertProceeding,/**/);
+        handler->notifyBreakpointInsertOk(id);
+    }
 }
 
-void QScriptDebuggerClient::disconnect()
+void QScriptDebuggerClient::endSession()
 {
 }
 
@@ -408,8 +414,6 @@ void QScriptDebuggerClient::messageReceived(const QByteArray &data)
             BreakHandler *handler = d->engine->breakHandler();
             foreach (BreakpointModelId id, handler->engineBreakpointIds(d->engine)) {
                 QString processedFilename = handler->fileName(id);
-                QTC_ASSERT(handler->state(id) == BreakpointInsertProceeding,/**/);
-                handler->notifyBreakpointInsertOk(id);
 
                 if (processedFilename == file && handler->lineNumber(id) == line) {
                     QTC_ASSERT(handler->state(id) == BreakpointInserted,/**/);
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.h b/src/plugins/debugger/qml/qscriptdebuggerclient.h
index 79318cd806e2b217a2d08a5c0f9b89723af7223e..daafb90ef0f10b02b8f7e8e6f6fbf23c343d48e2 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.h
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.h
@@ -51,8 +51,8 @@ public:
     QScriptDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
     ~QScriptDebuggerClient();
 
-    void connect();
-    void disconnect();
+    void startSession();
+    void endSession();
 
     void executeStep();
     void executeStepOut();