diff --git a/cmd/context.go b/cmd/context.go
index cf6d3faf..58f60389 100644
--- a/cmd/context.go
+++ b/cmd/context.go
@@ -69,7 +69,10 @@ func contextSwitch(ctx *cli.Context) error {
 
 	server.Project = project.ID
 
-	cf.Write()
+	err = cf.Write()
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/cmd/login.go b/cmd/login.go
index 70654672..c80dce7c 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -137,7 +137,10 @@ func loginSetup(ctx *cli.Context) error {
 	cf.CurrentServer = serverName
 	cf.Servers[serverName] = serverConfig
 
-	cf.Write()
+	err = cf.Write()
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/cmd/server.go b/cmd/server.go
index d2c2f338..fd8c15e7 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -99,7 +99,10 @@ func serverDelete(ctx *cli.Context) error {
 	}
 
 	delete(cf.Servers, serverName)
-	cf.Write()
+	err = cf.Write()
+	if err != nil {
+		return err
+	}
 	logrus.Infof("Server %s deleted", serverName)
 	return nil
 }
@@ -160,7 +163,10 @@ func serverSwitch(ctx *cli.Context) error {
 	}
 
 	cf.CurrentServer = serverName
-	cf.Write()
+	err = cf.Write()
+	if err != nil {
+		return err
+	}
 
 	return nil
 }