diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index a377a639ef5b..27cf86c4c25d 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -669,6 +669,7 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
         debugserver_args.AppendArgument("--setsid");
 
         char named_pipe_path[PATH_MAX];
+        named_pipe_path[0] = '\0';
 
         bool listen = false;
         if (host_and_port[0])
@@ -703,22 +704,15 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
                         debugserver_args.AppendArgument("--named-pipe");
                         debugserver_args.AppendArgument(named_pipe_path);
                     }
-                    else
-                        named_pipe_path[0] = '\0';
                 }
-                else
-                    named_pipe_path[0] = '\0';
             }
             else
             {
-                named_pipe_path[0] = '\0';
                 listen = true;
             }
         }
         else
         {
-            named_pipe_path[0] = '\0';
-        
             // No host and port given, so lets listen on our end and make the debugserver
             // connect to us..
             error = StartListenThread ("localhost", 0);