diff --git a/solumclient/solum.py b/solumclient/solum.py
index 9f6488a..145faeb 100644
--- a/solumclient/solum.py
+++ b/solumclient/solum.py
@@ -216,9 +216,10 @@ def main():
     try:
         parsed, _ = parser.parse_known_args()
         resource = parsed.resource
-    except Exception as se_except:
+    except Exception:
+        print("Invalid target specified to act upon.\n")
         parser.print_help()
-        return se_except
+        sys.exit(1)
 
     if resource in resources:
         try:
diff --git a/solumclient/tests/test_solum.py b/solumclient/tests/test_solum.py
index a337dec..613e217 100644
--- a/solumclient/tests/test_solum.py
+++ b/solumclient/tests/test_solum.py
@@ -95,12 +95,11 @@ class TestSolum(base.TestCase):
             '.*?^optional arguments'
 
         ]
-        for argstr in ['--help', 'help']:
-            help_text = self.shell(argstr)
-            for r in required:
-                self.assertThat(help_text,
-                                matchers.MatchesRegex(r,
-                                                      self.re_options))
+        help_text = self.shell('--help')
+        for r in required:
+            self.assertThat(help_text,
+                            matchers.MatchesRegex(r,
+                                                  self.re_options))
 
     # Assembly Tests #
     @mock.patch.object(assembly.AssemblyManager, "list")