diff --git a/atomicapp/cli/main.py b/atomicapp/cli/main.py
index 8f2fca05..43fe8a7f 100644
--- a/atomicapp/cli/main.py
+++ b/atomicapp/cli/main.py
@@ -38,6 +38,7 @@
                                  PROVIDERS)
 from atomicapp.nulecule import NuleculeManager
 from atomicapp.nulecule.exceptions import NuleculeException, DockerException
+from atomicapp.plugin import ProviderFailedException
 from atomicapp.utils import Utils
 
 logger = logging.getLogger(LOGGER_DEFAULT)
@@ -122,6 +123,9 @@ def cli_func_exec(cli_func, cli_func_args):
     except NuleculeException as e:
         logger.error(e)
         sys.exit(1)
+    except ProviderFailedException as e:
+        logger.error(e)
+        sys.exit(1)
     except Exception as e:
         logger.error(e, exc_info=True)
         sys.exit(1)
@@ -371,7 +375,8 @@ def create_parser(self):
 
     def run(self):
         cmdline = sys.argv[1:]  # Grab args from cmdline
-
+        if len(cmdline) == 0:   # Show help if no args are given by the user
+            cmdline = ['-h']
         # Initial setup of logging (to allow for a few early debug statements)
         Logging.setup_logging(verbose=True, quiet=False)