diff --git a/cmd/make.go b/cmd/make.go
index 13c900c20..ef2603497 100644
--- a/cmd/make.go
+++ b/cmd/make.go
@@ -208,6 +208,6 @@ func init() {
 		},
 	}
 
-	makeCmd.PersistentFlags().Uint32Var(&rawArgs.quota, "quota-gb", 0, "Specifies the maximum size of the share in gigabytes (GiB), 0 means you accept the file service's default quota.")
+	makeCmd.PersistentFlags().Uint32Var(&rawArgs.quota, "quota-gb", 0, "Specifies the maximum size of the share in gigabytes (GiB), 0 means you accept the file service's default quota. If `ShareSizeLimitReached` error is hit, increase quota and call resume command.")
 	rootCmd.AddCommand(makeCmd)
 }
diff --git a/ste/jobStatusManager.go b/ste/jobStatusManager.go
index d1daf551a..545a5b5c3 100755
--- a/ste/jobStatusManager.go
+++ b/ste/jobStatusManager.go
@@ -134,10 +134,12 @@ func (jm *jobMgr) handleStatusUpdateMessage() {
 		case msg, ok := <-jstm.xferDone:
 			if !ok { // Channel is closed, all transfers have been attended.
 				jstm.xferDone = nil
-
 				// close drainXferDone so that other components can know no further updates happen
 				allXferDoneHandled = true
-				close(jstm.xferDoneDrained)
+				if jstm.xferDoneDrained != nil {
+					close(jstm.xferDoneDrained)
+					jstm.xferDoneDrained = nil
+				}
 				continue
 			}
 
diff --git a/ste/mgr-JobMgr.go b/ste/mgr-JobMgr.go
index ebd800227..d75715695 100755
--- a/ste/mgr-JobMgr.go
+++ b/ste/mgr-JobMgr.go
@@ -717,6 +717,7 @@ func (jm *jobMgr) reportJobPartDoneHandler() {
 				// Inform StatusManager that all parts are done.
 				if jm.jstm.xferDone != nil {
 					close(jm.jstm.xferDone)
+					jm.jstm.xferDone = nil
 				}
 
 				// Wait  for all XferDone messages to be processed by statusManager. Front end