diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java
index 3f757d4ca..ca9ca2f94 100644
--- a/command/src/com/mirth/connect/cli/CommandLineInterface.java
+++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java
@@ -56,6 +56,7 @@
 import com.mirth.connect.client.core.BrandingConstants;
 import com.mirth.connect.client.core.Client;
 import com.mirth.connect.client.core.ClientException;
+import com.mirth.connect.client.core.UnauthorizedException;
 import com.mirth.connect.client.core.ListHandlerException;
 import com.mirth.connect.client.core.PaginatedEventList;
 import com.mirth.connect.client.core.PaginatedMessageList;
@@ -218,8 +219,12 @@ private void runShell(String server, String user, String password, String script
             client.logout();
             client.close();
             out.println("Disconnected from server.");
+        } catch (UnauthorizedException ue) {
+            error("Could not login to server: invalid username or password.", null);
+            System.exit(1);
         } catch (ClientException ce) {
-            ce.printStackTrace();
+            error("A client error occurred.", ce);
+            System.exit(1);
         } catch (IOException ioe) {
             error("Could not load script file.", ioe);
         } catch (URISyntaxException e) {