diff --git a/commands/connect.go b/commands/connect.go
index dc7c0ae..313bc00 100644
--- a/commands/connect.go
+++ b/commands/connect.go
@@ -23,8 +23,9 @@ func connect(cmdline string) error {
 
 	// All is good, update hosts state
 	if err := hosts.Register(host); err != nil {
-		return fmt.Errorf("Error connecting to host: %s", err)
+		return err
 	}
+
 	fmt.Printf("Verified Host(%s) Exists.\n", uuid)
 
 	results, err := api.ScheduleQueryAndWait(
diff --git a/hosts/hosts.go b/hosts/hosts.go
index 8b87312..b0feb84 100644
--- a/hosts/hosts.go
+++ b/hosts/hosts.go
@@ -51,7 +51,7 @@ func Register(newHost Host) error {
 	for i, host := range connectedHosts {
 		if newHost.UUID == host.UUID {
 			currentHostIndex = i
-			return nil
+			return fmt.Errorf("Active Host Switched")
 		}
 	}
 	connectedHosts = append(connectedHosts, newHost)