diff --git a/Main.py b/Main.py
index a8221298..e58dcdaf 100644
--- a/Main.py
+++ b/Main.py
@@ -113,7 +113,7 @@ def main(args, seed=None):
         # item in item_table gets checked in mystery, but not CLI - so we double-check here
         world.local_items[player] = {item.strip() for item in args.local_items[player].split(',') if
                                      item.strip() in item_table}
-        world.non_local_items[player] = {item.strip() for item in args.local_items[player].split(',') if
+        world.non_local_items[player] = {item.strip() for item in args.non_local_items[player].split(',') if
                                          item.strip() in item_table}
         # items can't be both local and non-local, prefer local
         world.non_local_items[player] -= world.local_items[player]
diff --git a/Mystery.py b/Mystery.py
index 2e1b29e2..d74c9973 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -497,7 +497,7 @@ def roll_settings(weights):
             if item in item_table:
                 ret.non_local_items.add(item)
             else:
-                raise Exception(f"Could not force item {item} to be world-local, as it was not recognized.")
+                raise Exception(f"Could not force item {item} to be world-non-local, as it was not recognized.")
 
     ret.non_local_items = ",".join(ret.non_local_items)