diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java
index a55e04ead34..9abf52039cf 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java
@@ -162,13 +162,9 @@ protected void printHelpFromFile() {
     }
 
     protected void handleException(Exception exception, String serviceUrl) throws Exception {
-        Throwable cause = exception.getCause();
-        while (true) {
-            Throwable next = cause.getCause();
-            if (next == null) {
-                break;
-            }
-            cause = next;
+        Throwable cause = exception;
+        while (cause.getCause() != null) {
+            cause = cause.getCause();
         }
         if (cause instanceof ConnectException) {
             context.printInfo("Broker not available at: " + serviceUrl);
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
index 97e508450a0..6a84b569aa5 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java
@@ -388,7 +388,7 @@ public void execute(List<String> tokens) throws Exception {
         try {
             super.execute(tokens);
         } catch (Exception exception) {
-            handleException(exception, jmxServiceUrl.toString());
+            handleException(exception, jmxServiceUrl != null ? jmxServiceUrl.toString() : "local");
             return;
         }finally {
             closeJmxConnection();