React to Meek client binary not found

1 files changed, 11 insertions, 0 deletions

diff --git a/cli/onionshare_cli/meek.py b/cli/onionshare_cli/meek.py
index 675402d3..ff44cb13 100644
--- a/cli/onionshare_cli/meek.py
+++ b/cli/onionshare_cli/meek.py
@@ -72,6 +72,12 @@ class Meek(object):
                 queue.put(line)
             out.close()
 
+        # Abort early if we can't find the Meek client
+        # common.get_tor_paths() has already checked it's a file
+        # so just abort if it's a NoneType object
+        if self.meek_client_file_path is None:
+            raise MeekNotFound()
+
         # Start the Meek Client as a subprocess.
 
         if self.common.platform == "Windows":
@@ -179,3 +185,8 @@ class MeekNotRunning(Exception):
     We were unable to start Meek or obtain the port
     number it started on, in order to do domain fronting.
     """
+
+class MeekNotFound(Exception):
+    """
+    We were unable to find the Meek Client binary.
+    """