diff --git a/server/cloud9/optparse.js b/server/cloud9/optparse.js
index c0526ab351c..e45512dcc83 100644
--- a/server/cloud9/optparse.js
+++ b/server/cloud9/optparse.js
@@ -39,8 +39,12 @@ var Parser = module.exports = function(options) {
     }
 
     this.parseArguments = function(argv) {
+        argv = argv.concat();
         var arg, key, opt, opts = {}, opts_def = {};
-        while (argv.length && (arg = argv.shift())) {
+        while (argv.length && argv.length) {
+            arg = argv.shift();
+            if (!arg)
+                continue;
             opt = this.$getArg(argv, arg);
             opts[opt.key] = opt.value;
         }