diff --git a/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/city_panel.py b/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/city_panel.py
index 7b7368d4..09b42eae 100644
--- a/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/city_panel.py
+++ b/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/city_panel.py
@@ -166,17 +166,18 @@ def prepare_city_list(self):
         self.city_list = []
 
         def _close_panel(*args):
-            self.close()
+            self.close(None)
 
         city_cfg_path = join(SYSTEM_DIR, "new_city.cfg")
         if not exists(city_cfg_path):
             self.session.openWithCallback(
                 _close_panel,
                 MessageBox,
-                _("City list file not found!"),
+                _("City list file not found! Use the search to find your city first."),
                 MessageBox.TYPE_WARNING,
                 timeout=5
             )
+            return
 
         try:
             with open(city_cfg_path, "r", encoding="utf-8") as f:
diff --git a/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/plugin.py b/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/plugin.py
index 25ac6e69..9291ca9b 100644
--- a/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/plugin.py
+++ b/usr/lib/enigma2/python/Plugins/Extensions/Foreca1/plugin.py
@@ -963,7 +963,7 @@ def menu_callback(self, choice):
         elif key == "exit":
             return
 
-    def city_selected(self, result):
+    def city_selected(self, result=None):
         if result is None:
             return