diff --git a/mvt/android/cli.py b/mvt/android/cli.py
index 11e9070..ceae580 100644
--- a/mvt/android/cli.py
+++ b/mvt/android/cli.py
@@ -47,7 +47,7 @@ def cli():
 @click.option("--koodous", "-k", is_flag=True, help="Check packages on Koodous")
 @click.option("--all-checks", "-A", is_flag=True, help="Run all available checks")
 @click.option("--output", "-o", type=click.Path(exists=False),
-              help="Specify a path to a folder where you want to store JSON results")
+              help="Specify a path to a folder where you want to store the APKs")
 @click.option("--from-file", "-f", type=click.Path(exists=True),
               help="Instead of acquiring from phone, load an existing packages.json file for lookups (mainly for debug purposes)")
 def download_apks(all_apks, virustotal, koodous, all_checks, output, from_file):
@@ -55,11 +55,11 @@ def download_apks(all_apks, virustotal, koodous, all_checks, output, from_file):
         if from_file:
             download = DownloadAPKs.from_json(from_file)
         else:
-            try:
-                os.makedirs(output)
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    log.critical("You need to specify a writable output folder (with --output, -o) when extracting APKs from a device")
+            if output and not os.path.exists(output):
+                try:
+                    os.makedirs(output)
+                except Exception as e:
+                    log.critical("Unable to create output folder %s: %s", output, e)
                     sys.exit(-1)
 
             download = DownloadAPKs(output_folder=output, all_apks=all_apks)
@@ -99,6 +99,13 @@ def check_adb(iocs, output, list_modules, module):
 
     log.info("Checking Android through adb bridge")
 
+    if output and not os.path.exists(output):
+        try:
+            os.makedirs(output)
+        except Exception as e:
+            log.critical("Unable to create output folder %s: %s", output, e)
+            sys.exit(-1)
+
     if iocs:
         # Pre-load indicators for performance reasons.
         log.info("Loading indicators from provided file at %s", iocs)
@@ -121,13 +128,6 @@ def check_adb(iocs, output, list_modules, module):
         timeline_detected.extend(m.timeline_detected)
 
     if output:
-        try:
-            os.makedirs(output)
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                log.critical("You need to specify a writable output folder (with --output, -o) to log the details observed from ADB")
-                sys.exit(-1)
-
         if len(timeline) > 0:
             save_timeline(timeline, os.path.join(output, "timeline.csv"))
         if len(timeline_detected) > 0:
@@ -143,11 +143,11 @@ def check_adb(iocs, output, list_modules, module):
 def check_backup(iocs, output, backup_path):
     log.info("Checking ADB backup located at: %s", backup_path)
 
-    try:
-        os.makedirs(output)
-    except OSError as e:
-        if e.errno != errno.EEXIST:
-            log.critical("You need to specify a writable output folder (with --output, -o) when analysing the ADB backup")
+    if output and not os.path.exists(output):
+        try:
+            os.makedirs(output)
+        except Exception as e:
+            log.critical("Unable to create output folder %s: %s", output, e)
             sys.exit(-1)
 
     if iocs:
diff --git a/mvt/ios/cli.py b/mvt/ios/cli.py
index bc5d022..3e265bf 100644
--- a/mvt/ios/cli.py
+++ b/mvt/ios/cli.py
@@ -82,6 +82,13 @@ def check_backup(iocs, output, fast, backup_path, list_modules, module):
 
     log.info("Checking iTunes backup located at: %s", backup_path)
 
+    if output and not os.path.exists(output):
+        try:
+            os.makedirs(output)
+        except Exception as e:
+            log.critical("Unable to create output folder %s: %s", output, e)
+            sys.exit(-1)
+
     if iocs:
         # Pre-load indicators for performance reasons.
         log.info("Loading indicators from provided file at: %s", iocs)
@@ -106,12 +113,6 @@ def check_backup(iocs, output, fast, backup_path, list_modules, module):
         timeline_detected.extend(m.timeline_detected)
 
     if output:
-        try:
-            os.makedirs(output)
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                log.critical("You need to specify a writable output folder (with --output, -o) when analysing the backup")
-                sys.exit(-1)
         if len(timeline) > 0:
             save_timeline(timeline, os.path.join(output, "timeline.csv"))
         if len(timeline_detected) > 0:
@@ -138,6 +139,13 @@ def check_fs(iocs, output, fast, dump_path, list_modules, module):
 
     log.info("Checking filesystem dump located at: %s", dump_path)
 
+    if output and not os.path.exists(output):
+        try:
+            os.makedirs(output)
+        except Exception as e:
+            log.critical("Unable to create output folder %s: %s", output, e)
+            sys.exit(-1)
+
     if iocs:
         # Pre-load indicators for performance reasons.
         log.info("Loading indicators from provided file at: %s", iocs)
@@ -163,12 +171,6 @@ def check_fs(iocs, output, fast, dump_path, list_modules, module):
         timeline_detected.extend(m.timeline_detected)
 
     if output:
-        try:
-            os.makedirs(output)
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                log.critical("You need to specify a writable output folder (with --output, -o) when analysing the file system")
-                sys.exit(-1)
         if len(timeline) > 0:
             save_timeline(timeline, os.path.join(output, "timeline.csv"))
         if len(timeline_detected) > 0: