diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index d8694f24..dda6c32b 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -167,6 +167,10 @@ def get_actions(setup_mode, answers):
     for _sub_key in SETUP_ACTION_KEYS:
       _action[_sub_key] = _val.get(_sub_key, None)
 
+    # Fix KWArgs
+    if _action.get('KWArgs', {}) is None:
+      _action['KWArgs'] = {}
+
     # Handle "special" actions
     if _key == 'KIT_NAME_FULL':
       _key = KIT_NAME_FULL
@@ -290,7 +294,7 @@ def main():
 
     # Print info lines
     if values.get('Info', False):
-      print_info(values['Info'])
+      print_info(action)
       continue
 
     # Print skipped actions