diff --git a/configs/cli.js b/configs/cli.js
index 2a4be963..d6f247e1 100644
--- a/configs/cli.js
+++ b/configs/cli.js
@@ -56,7 +56,8 @@ return [
         packagePath: "./c9.ide.auth/auth",
         accessToken: "token",
         ideBaseUrl: "",
-        apiUrl: APIURL
+        apiUrl: APIURL,
+        cli: true
         // userId: process.env.C9_USER
     },
     {
diff --git a/plugins/c9.cli/auth.bootstrap.js b/plugins/c9.cli/auth.bootstrap.js
index a24fd471..684225f1 100644
--- a/plugins/c9.cli/auth.bootstrap.js
+++ b/plugins/c9.cli/auth.bootstrap.js
@@ -66,7 +66,6 @@ define(function(require, exports, module) {
                 }, function(err, token) {
                     if (err) return callback(err);
                     
-                    
                     fs.writeFile(AUTHPATH, token, function(err){
                         if (err) return callback(err);
                         callback(null, lastToken = token);
diff --git a/plugins/c9.fs/fs.js b/plugins/c9.fs/fs.js
index a3145076..376f68fb 100644
--- a/plugins/c9.fs/fs.js
+++ b/plugins/c9.fs/fs.js
@@ -55,7 +55,7 @@ define(function(require, exports, module) {
             loaded = true;
             
             if (options.cli)
-                plugin.on("error", function(e){ console.error(e.error); });
+                plugin.on("error", function(e){ }); // Prevent exception
         }
         
         function wrap(name, fn) {
diff --git a/plugins/c9.ide.auth/auth.js b/plugins/c9.ide.auth/auth.js
index 8508ba0f..54fd2633 100644
--- a/plugins/c9.ide.auth/auth.js
+++ b/plugins/c9.ide.auth/auth.js
@@ -80,7 +80,10 @@ define(function(require, exports, module) {
 
                 request(apiUrl + "/user", function(err, user) {
                     if (err || !user) {
-                        console.warn("LOGIN: API /user err", err);
+                        if (options.cli)
+                            console.warn("Invalid username or password. Please try again.");
+                        else
+                            console.warn("LOGIN: API /user err", err);
                         return setTimeout(login, 1000);
                     }