Index: command/src/main/java/org/apache/karaf/admin/main/Execute.java
===================================================================
--- command/src/main/java/org/apache/karaf/admin/main/Execute.java	(revision 1097028)
+++ command/src/main/java/org/apache/karaf/admin/main/Execute.java	(working copy)
@@ -63,10 +63,10 @@
             listCommands();
             exit(0);
         }
-        
-        Class<?> cls = COMMANDS.get(args[0]);
+        String commandName = args[0];
+        Class<?> cls = COMMANDS.get(commandName);
         if (cls == null) {
-            System.err.println("Command not found: " + args[0]);
+            System.err.println("Command not found: " + commandName);
             exit(-1);
         }
 
@@ -81,9 +81,16 @@
         
         Object command = cls.newInstance();
         if (command instanceof AdminCommandSupport) {
-            execute((AdminCommandSupport) command, storageFile, args);            
+        	try {
+        		execute((AdminCommandSupport) command, storageFile, args);  
+            } catch (Exception e) {
+            	System.err.println("Error executing command '" + commandName + "' : " + e.getMessage());
+            	if (System.getProperty("karaf.showStracktrace") != null) {
+            		throw e;
+            	}
+            }
         } else {
-            System.err.println("Not an admin command: " + args[0]);
+            System.err.println("Not an admin command: " + commandName);
             exit(-1);
         }
     }