diff --git a/meshbook.py b/meshbook.py
index 8bfbffd..91f84a3 100644
--- a/meshbook.py
+++ b/meshbook.py
@@ -259,18 +259,22 @@ async def main():
             Console.print_text(args.silent, "Writing to file...")
             history.write_history(formatted_history)
 
-        await session.close()
-
     except OSError as message:
-        Console.print_text(args.silent,
-                           Console.text_color.red + f'{message}')
+        Console.print_text(
+            args.silent,
+            Console.text_color.red + f'{message}'
+        )
 
     except asyncio.CancelledError:
-        Console.print_text(args.silent,
-                           Console.text_color.red + "Received SIGINT, Aborting - (Tasks may still be running on targets).")
-        await session.close()
+        Console.print_text(
+            args.silent,
+            Console.text_color.red + "Received SIGINT, Aborting - (Tasks may still be running on targets)."
+        )
         raise
 
+    finally:
+        await session.close()
+
 if __name__ == "__main__":
     try:
         asyncio.run(main())
diff --git a/modules/utilities.py b/modules/utilities.py
index 6ff571a..d97f60c 100644
--- a/modules/utilities.py
+++ b/modules/utilities.py
@@ -117,7 +117,12 @@ class Utilities:
                     )
 
             case {"groups": pseudo_target}:
-                if isinstance(pseudo_target, list):
+                if isinstance(pseudo_target, str) or (isinstance(pseudo_target, list) and len(pseudo_target) == 1):
+                    Console.print_text(
+                        silent,
+                        Console.text_color.yellow + "The 'groups' key is being used, but only one group seems to be given. Did you mean 'group'?"
+                    )
+                elif isinstance(pseudo_target, list):
                     for sub_group in pseudo_target:
                         sub_group = sub_group.lower()
                         if sub_group in group_list:
@@ -125,11 +130,6 @@ class Utilities:
                 elif isinstance(pseudo_target, str) and pseudo_target.lower() == "all":
                     for group in group_list.values():
                         await process_group_helper(group)
-                elif isinstance(pseudo_target, str):
-                    Console.print_text(
-                        silent,
-                        Console.text_color.yellow + "The 'groups' key is being used, but only one string is given. Did you mean 'group'?"
-                    )
                 else:
                     Console.print_text(
                         silent,
@@ -151,14 +151,14 @@ class Utilities:
                     )
 
             case {"devices": pseudo_target}:
-                if isinstance(pseudo_target, list):
-                    for sub_device in pseudo_target:
-                        await process_device_helper(sub_device)
-                elif isinstance(pseudo_target, str):
+                if isinstance(pseudo_target, str) or (isinstance(pseudo_target, list) and len(pseudo_target) == 1):
                     Console.print_text(
                         silent,
-                        Console.text_color.yellow + "The 'devices' key is being used, but only one string is given. Did you mean 'device'?"
+                        Console.text_color.yellow + "The 'devices' key is being used, but only one device seems to be given. Did you mean 'device'?"
                     )
+                elif isinstance(pseudo_target, list):
+                    for sub_device in pseudo_target:
+                        await process_device_helper(sub_device)
                 else:
                     Console.print_text(
                         silent,