Index: source/Target/TargetList.cpp
===================================================================
--- source/Target/TargetList.cpp
+++ source/Target/TargetList.cpp
@@ -298,7 +298,7 @@
         if (!platform_sp->IsCompatibleArchitecture(arch, false, &platform_arch))
         {
             platform_sp = Platform::GetPlatformForArchitecture(arch, &platform_arch);
-            if (!is_dummy_target && platform_sp)
+            if (platform_sp)
                 debugger.GetPlatformList().SetSelectedPlatform(platform_sp);
         }
     }
@@ -310,7 +310,7 @@
         if (!platform_sp->IsCompatibleArchitecture(platform_arch, false, &fixed_platform_arch))
         {
             platform_sp = Platform::GetPlatformForArchitecture(platform_arch, &fixed_platform_arch);
-            if (!is_dummy_target && platform_sp)
+            if (platform_sp)
                 debugger.GetPlatformList().SetSelectedPlatform(platform_sp);
         }
     }
@@ -476,7 +476,7 @@
         // Set argv0 with what the user typed, unless the user specified a
         // directory. If the user specified a directory, then it is probably a
         // bundle that was resolved and we need to use the resolved bundle path
-        if (user_exe_path)
+        if (user_exe_path && user_exe_path[0])
         {
             // Use exactly what the user typed as the first argument when we exec or posix_spawn
             if (user_exe_path_is_bundle && resolved_bundle_exe_path[0])