diff --git a/lib/calabash/android/adb.rb b/lib/calabash/android/adb.rb
index <HASH>..<HASH> 100644
--- a/lib/calabash/android/adb.rb
+++ b/lib/calabash/android/adb.rb
@@ -43,7 +43,7 @@ module Calabash
             end
           end
 
-          t.join
+          t.join if t
         end
       end
Android::ADB: Fix: Do as expected when the process could not be started