diff --git a/ciao-launcher/doc.go b/ciao-launcher/doc.go
index edc34e4d1..5620634c7 100644
--- a/ciao-launcher/doc.go
+++ b/ciao-launcher/doc.go
@@ -42,10 +42,7 @@
 // it instructs all child go routines to quit and waits for their exit.  Note that
 // it only waits for 1 second.  If all child go routines have failed to exit in 1
 // second, ciao-launcher panics.  The panic is useful as it prints the stack trace of
-// all the running go routines, so you can see which ones are blocked.  At least
-// this was the intention.  The default behaviour of the go runtime has changed in
-// this regard in 1.6 so a small code change is required, but you get the idea, I
-// hope.
+// all the running go routines, so you can see which ones are blocked.
 //
 // The Server go routine
 //
diff --git a/ciao-launcher/main.go b/ciao-launcher/main.go
index 5a3d6208f..8dbcfb622 100644
--- a/ciao-launcher/main.go
+++ b/ciao-launcher/main.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
@@ -24,12 +25,11 @@ import (
 	"os"
 	"os/signal"
 	"path"
+	"runtime/debug"
 	"sync"
 	"syscall"
 	"time"
 
-	"context"
-
 	"github.com/01org/ciao/osprepare"
 	"github.com/01org/ciao/payloads"
 	"github.com/01org/ciao/ssntp"
@@ -389,50 +389,52 @@ func connectToServer(doneCh chan struct{}, statusCh chan struct{}) {
 		dialCh <- err
 	}()
 
-	dialing := true
+	select {
+	case err := <-dialCh:
+		if err != nil {
+			break
+		}
+		clusterConfig, err := client.conn.ClusterConfiguration()
+		if err != nil {
+			glog.Errorf("Unable to get Cluster Configuration %v", err)
+			client.conn.Close()
+			break
+		}
+		computeNet = clusterConfig.Configure.Launcher.ComputeNetwork
+		mgmtNet = clusterConfig.Configure.Launcher.ManagementNetwork
+		diskLimit = clusterConfig.Configure.Launcher.DiskLimit
+		memLimit = clusterConfig.Configure.Launcher.MemoryLimit
+		if secretPath == "" {
+			secretPath = clusterConfig.Configure.Storage.SecretPath
+		}
+		if cephID == "" {
+			cephID = clusterConfig.Configure.Storage.CephID
+		}
+		printClusterConfig()
 
-DONE:
-	for {
-		select {
-		case err := <-dialCh:
-			dialing = false
-			if err != nil {
-				break DONE
-			}
-			clusterConfig, err := client.conn.ClusterConfiguration()
-			if err != nil {
-				glog.Errorf("Unable to get Cluster Configuration %v", err)
-				client.conn.Close()
-				break DONE
-			}
-			computeNet = clusterConfig.Configure.Launcher.ComputeNetwork
-			mgmtNet = clusterConfig.Configure.Launcher.ManagementNetwork
-			diskLimit = clusterConfig.Configure.Launcher.DiskLimit
-			memLimit = clusterConfig.Configure.Launcher.MemoryLimit
-			if secretPath == "" {
-				secretPath = clusterConfig.Configure.Storage.SecretPath
-			}
-			if cephID == "" {
-				cephID = clusterConfig.Configure.Storage.CephID
-			}
-			printClusterConfig()
+		client.installLauncherDeps()
 
-			client.installLauncherDeps()
+		err = startNetwork(doneCh)
+		if err != nil {
+			glog.Errorf("Failed to start network: %v\n", err)
+			client.conn.Close()
+			break
+		}
+		defer shutdownNetwork()
 
-			err = startNetwork(doneCh)
-			if err != nil {
-				glog.Errorf("Failed to start network: %v\n", err)
-				client.conn.Close()
-				break DONE
-			}
-			defer shutdownNetwork()
+		ovsCh = startOverseer(&wg, client)
+	case <-doneCh:
+		client.conn.Close()
+		<-dialCh
+		return
+	}
 
-			ovsCh = startOverseer(&wg, client)
+DONE:
+	for {
+		select {
 		case <-doneCh:
 			client.conn.Close()
-			if !dialing {
-				break DONE
-			}
+			break DONE
 		case cmd := <-client.cmdCh:
 			/*
 				Double check we're not quitting here.  Otherwise a flood of commands
@@ -563,7 +565,7 @@ DONE:
 			glog.Flush()
 
 			/* We panic here to see which naughty go routines are still running. */
-
+			debug.SetTraceback("all")
 			panic("Server Loop did not exit within 1 second quitting")
 		}
 	}