diff --git a/cluster/manager/manager.go b/cluster/manager/manager.go
index <HASH>..<HASH> 100644
--- a/cluster/manager/manager.go
+++ b/cluster/manager/manager.go
@@ -813,7 +813,6 @@ func (c *ClusterManager) updateClusterStatus() {
 			if c.size > 0 && numNodes > c.size {
 				logrus.Fatalf("Fatal, number of nodes in the cluster has"+
 					"exceeded the cluster size: %d > %d", numNodes, c.size)
-				os.Exit(1)
 			}
 
 			// Special handling for self node
@@ -844,8 +843,7 @@ func (c *ClusterManager) updateClusterStatus() {
 					c.gossip.UpdateSelfStatus(types.NODE_STATUS_DOWN)
 					c.selfNode.Status = api.Status_STATUS_OFFLINE
 					c.status = api.Status_STATUS_NOT_IN_QUORUM
-					c.Shutdown()
-					os.Exit(1)
+					logrus.Fatal(c.Shutdown())
 				} else if c.selfNode.Status == api.Status_STATUS_NOT_IN_QUORUM &&
 					gossipNodeInfo.Status == types.NODE_STATUS_UP {
 					// Current:
Use fatal in favor of error and exit(1) (#<I>)