diff --git a/cfg_checker/cfg_check.py b/cfg_checker/cfg_check.py
index 9260f30..78436d6 100644
--- a/cfg_checker/cfg_check.py
+++ b/cfg_checker/cfg_check.py
@@ -31,7 +31,11 @@
 
 def pkg_check(args):
     # create package versions report
-    _filename = args.file
+    if args.file:
+        _filename = args.file
+    else:
+        logger_cli.error("ERROR: no report filename supplied")
+        return
     # init connection to salt and collect minion data
     pChecker = CloudPackageChecker()
     # collect data on installed packages
@@ -74,6 +78,7 @@
         '--file',
         help="HTML filename to save report"
     )
+    pkg_report_parser.set_defaults(func=pkg_check)
 
     # networking
     net_parser = subparsers.add_parser(
@@ -109,4 +114,7 @@
     return
 
 if __name__ == '__main__':
-    config_check_entrypoint()
+    try:
+        config_check_entrypoint()
+    except Exception as e:
+        logger_cli.error("ERROR: {}".format(e.message))
diff --git a/cfg_checker/pkg_check.py b/cfg_checker/pkg_check.py
index 34907c5..a2f64ac 100644
--- a/cfg_checker/pkg_check.py
+++ b/cfg_checker/pkg_check.py
@@ -20,8 +20,6 @@
 
 
 class CloudPackageChecker(object):
-    _config = config
-
     def __init__(self):
         logger_cli.info("Collecting nodes for package check")
         # simple salt rest client
@@ -33,7 +31,7 @@
 
         logger_cli.info("Collecting node names existing in the cloud")
         self.node_keys = {
-            'minions': base_config.all_nodes
+            'minions': config.all_nodes
         }
 
         # all that answer ping
@@ -72,11 +70,11 @@
         )
         # Prepare script
         _script_filename = "pkg_versions.py"
-        _p = os.path.join(PKG_DIR, 'scripts', _script_filename)
+        _p = os.path.join(pkg_dir, 'scripts', _script_filename)
         with open(_p, 'rt') as fd:
             _script = fd.read().splitlines()
         _storage_path = os.path.join(
-            base_config.salt_file_root, base_config.salt_scripts_folder
+            config.salt_file_root, config.salt_scripts_folder
         )
         logger_cli.info(
             "Uploading script {} to master's file cache folder: '{}'".format(
@@ -89,12 +87,12 @@
         _cache_path = os.path.join(_storage_path, _script_filename)
         _source_path = os.path.join(
             'salt://',
-            base_config.salt_scripts_folder,
+            config.salt_scripts_folder,
             _script_filename
         )
         _target_path = os.path.join(
             '/root',
-            base_config.salt_scripts_folder,
+            config.salt_scripts_folder,
             _script_filename
         )
 
@@ -107,7 +105,7 @@
             _active_nodes_string,
             os.path.join(
                 '/root',
-                base_config.salt_scripts_folder
+                config.salt_scripts_folder
             ),
             tgt_type="compound"
         )