diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js
index 05bdbc9c..380d42e1 100644
--- a/plugins/c9.vfs.client/vfs.ping.js
+++ b/plugins/c9.vfs.client/vfs.ping.js
@@ -61,7 +61,7 @@ define(function(require, exports, module) {
                 };
             }
 
-            if (!api) return callback(new Error("Client is offline"));
+            if (!api || !vfs.connection) return callback(new Error("Client is offline"));
             
             if (!vfs.isIdle())
                 return vfs.connection.once("message", ping.bind(null, callback));