diff --git a/cli/server/add.go b/cli/server/add.go
index ce8f888a..eb2a3e7c 100644
--- a/cli/server/add.go
+++ b/cli/server/add.go
@@ -174,8 +174,8 @@ configuration. Checks for a valid online domain will be skipped.
 		}
 
 		if err := newContext(c, domainName, hostConfig.Host, hostConfig.User, hostConfig.Port); err != nil {
-			logrus.Fatal(err)
 			cleanUp(domainName)
+			logrus.Fatal(err)
 		}
 
 		logrus.Infof("attempting to create client for %s", domainName)