diff --git a/reclass/adapters/salt.py b/reclass/adapters/salt.py
index e2f415c..d7d34f0 100755
--- a/reclass/adapters/salt.py
+++ b/reclass/adapters/salt.py
@@ -25,7 +25,7 @@
                classes_uri=OPT_CLASSES_URI,
                class_mappings=None,
                propagate_pillar_data_to_reclass=False,
-               ignore_class_notfound=False):
+               ignore_class_notfound=OPT_IGNORE_CLASS_NOTFOUND):
 
     nodes_uri, classes_uri = path_mangler(inventory_base_uri,
                                           nodes_uri, classes_uri)
@@ -50,7 +50,7 @@
 def top(minion_id, storage_type=OPT_STORAGE_TYPE,
         inventory_base_uri=OPT_INVENTORY_BASE_URI, nodes_uri=OPT_NODES_URI,
         classes_uri=OPT_CLASSES_URI,
-        class_mappings=None, ignore_class_notfound=False):
+        class_mappings=None, ignore_class_notfound=OPT_IGNORE_CLASS_NOTFOUND):
 
     nodes_uri, classes_uri = path_mangler(inventory_base_uri,
                                           nodes_uri, classes_uri)
diff --git a/reclass/cli.py b/reclass/cli.py
index 5666e16..8f4617b 100644
--- a/reclass/cli.py
+++ b/reclass/cli.py
@@ -29,7 +29,7 @@
         storage = get_storage(options.storage_type, options.nodes_uri,
                               options.classes_uri, default_environment='base')
         class_mappings = defaults.get('class_mappings')
-        reclass = Core(storage, class_mappings)
+        reclass = Core(storage, class_mappings, ignore_class_notfound=options.ignore_class_notfound)
 
         if options.mode == MODE_NODEINFO:
             data = reclass.nodeinfo(options.nodename)
diff --git a/reclass/config.py b/reclass/config.py
index 6a49809..fca982f 100644
--- a/reclass/config.py
+++ b/reclass/config.py
@@ -29,7 +29,7 @@
     ret.add_option('-c', '--classes-uri', dest='classes_uri',
                    default=defaults.get('classes_uri', OPT_CLASSES_URI),
                    help='the URI to the classes storage [%default]')
-    ret.add_option('-i', '--ignore-class-notfound', dest='ignore_class_notfound',
+    ret.add_option('-z', '--ignore-class-notfound', dest='ignore_class_notfound',
                    default=defaults.get('ignore_class_notfound', OPT_IGNORE_CLASS_NOTFOUND),
                    help='decision for not found classes [%default]')
     return ret