diff --git a/pokecli.py b/pokecli.py
index 786c7d1085..5b101554b1 100755
--- a/pokecli.py
+++ b/pokecli.py
@@ -424,13 +424,11 @@ def task_configuration_error(flag_name):
             Read https://github.com/PokemonGoF/PokemonGo-Bot/wiki/Configuration-files#configuring-tasks for more information.
             """.format(flag_name))
 
-    if 'mode' in load:
-        task_configuration_error("mode")
-        return None
-
-    if 'catch_pokemon' in load:
-        task_configuration_error("catch_pokemon")
-        return None
+    old_flags = ['mode', 'catch_pokemon']
+    for flag in old_flags:
+        if flag in load:
+            task_configuration_error(flag)
+            return None
 
     if (config.evolve_captured
         and (not isinstance(config.evolve_captured, str)