diff --git a/src/extension.ts b/src/extension.ts
index 72a0eaf..b08553d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -143,18 +143,26 @@ export function activate(context: vscode.ExtensionContext) {
 
     context.subscriptions.push(disposable, registration);
 
+    function changeSession(node: ConnectionNode) {
+        currentConnection = node;
+        statusBarItem.text = node.name;
+        if (dbSession) {
+            dbSession.stdin.end();
+            dbSession = null;
+        }
+    }
+
     vscode.commands.registerCommand('selectConnection', (node: ConnectionNode) => {
-        vscode.window.showInformationMessage(`You want to change the connection to '${node.name}'. Sure?`, 'Yes')
-        .then( (selection) => {
-            if (selection == 'Yes') {
-                currentConnection = node;
-                statusBarItem.text = node.name;
-                if (dbSession) {
-                    dbSession.stdin.end();
-                    dbSession = null;
+        if (!dbSession) {
+            changeSession(node)
+        } else {
+            vscode.window.showInformationMessage(`You want to change the connection to '${node.name}'. Sure?`, 'Yes')
+            .then( (selection) => {
+                if (selection == 'Yes') {
+                    changeSession(node);
                 }
-            }
-        }, (reason) => {})
+            }, (reason) => {})
+        }
 	})
 }
 
diff --git a/src/syntaxes/frog-runner.tmLanguage b/src/syntaxes/frog-runner.tmLanguage
index 758b1d8..9c6657d 100644
--- a/src/syntaxes/frog-runner.tmLanguage
+++ b/src/syntaxes/frog-runner.tmLanguage
@@ -19,6 +19,30 @@
                 <key>name</key>
                 <string>string.quoted</string>
             </dict>
+            <dict>
+                <key>match</key>
+                <string>Query successful.</string>
+                <key>name</key>
+                <string>keyword</string>
+            </dict>
+            <dict>
+                <key>match</key>
+                <string>Exception.*</string>
+                <key>name</key>
+                <string>invalid.illegal</string>
+            </dict>
+            <dict>
+                <key>match</key>
+                <string>Errors found:.*</string>
+                <key>name</key>
+                <string>invalid.illegal</string>
+            </dict>
+            <dict>
+                <key>match</key>
+                <string>^\d+:.*</string>
+                <key>name</key>
+                <string>invalid.illegal</string>
+            </dict>
         </array>
     </dict>
 </plist>
\ No newline at end of file