diff --git a/cli/server/add.go b/cli/server/add.go
index 78e6be7b..cc275e6f 100644
--- a/cli/server/add.go
+++ b/cli/server/add.go
@@ -170,6 +170,7 @@ your SSH configuration. Checks for a valid online domain will be skipped.
 		}
 
 		if err := newContext(c, domainName); err != nil {
+			cleanUp(domainName)
 			logrus.Fatal(err)
 		}