diff --git a/package.json b/package.json
index de28ebda..3f298f25 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#a18ca47fbe",
+        "c9.ide.collab": "#cfbf987438",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js
index 0fd09d42..0fb2d9c6 100644
--- a/plugins/c9.vfs.client/vfs_client.js
+++ b/plugins/c9.vfs.client/vfs_client.js
@@ -204,7 +204,7 @@ define(function(require, exports, module) {
 
         function reconnectNow() {
             reconnect(function(_err) {
-                connection.connect();
+                connection && connection.connect();
             });
         }