diff --git a/CHANGES.txt b/CHANGES.txt
index 00a67087d5..33914ad021 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@ Hadoop Change Log
 Trunk (unreleased changes)
 
   IMPROVEMENTS
+    HADOOP-6627. "Bad Connection to FS" message in FSShell should print 
+    message from the exception (boryas)
+
     HADOOP-6769. Add an API in FileSystem to get FileSystem instances based 
     on users(ddas via boryas)
 
diff --git a/src/java/org/apache/hadoop/fs/FsShell.java b/src/java/org/apache/hadoop/fs/FsShell.java
index 12abe07a8f..9815a2721a 100644
--- a/src/java/org/apache/hadoop/fs/FsShell.java
+++ b/src/java/org/apache/hadoop/fs/FsShell.java
@@ -1842,7 +1842,8 @@ public int run(String argv[]) throws Exception {
                          "... command aborted.");
       return exitCode;
     } catch (IOException e) {
-      System.err.println("Bad connection to FS. command aborted.");
+      System.err.println("Bad connection to FS. Command aborted. Exception: " +
+          e.getLocalizedMessage());
       return exitCode;
     }