diff --git a/slpkg/main.py b/slpkg/main.py
index 9c564d45..fac473a1 100644
--- a/slpkg/main.py
+++ b/slpkg/main.py
@@ -491,14 +491,14 @@ class Argparse(Configs):
         text: str = f'There are {len(choices)} packages:'
         code, tags = self.dialogbox.checklist(text, packages, title, height,
                                               width, list_height, choices)
-        os.system('clear')
-
         if code == 'cancel':
             raise SystemExit()
 
-        if not tags:
+        if not tags or not code:
             return packages
 
+        os.system('clear')
+
         return list(set(tags))
 
     def help(self) -> None:
@@ -826,19 +826,12 @@ def main():
         '-t': argparse.tracking
     }
 
-    # try:
-    #     arguments[args[0]]()
-    # except (KeyError, IndexError) as err:
-    #     logger = logging.getLogger(__name__)
-    #     logger.info('%s: %s', main.__name__, err)
-    #     usage.help_short(1)
-
-    # For development mode.
-    arguments[args[0]]()
-    logger = logging.getLogger(__name__)
-    logger.info('%s: %s', main.__name__, err)
-    usage.help_short(1)
-
+    try:
+        arguments[args[0]]()
+    except (KeyError, IndexError) as err:
+        logger = logging.getLogger(__name__)
+        logger.info('%s: %s', main.__name__, err)
+        usage.help_short(1)
 
 if __name__ == '__main__':
     main()