diff --git a/fileTransfer/store/received.go b/fileTransfer/store/received.go
index 189025a711b89537022a99ec72d19eaf98e63c91..fd715a76e7c4cf127bb9c9897c14432b26b59fe8 100644
--- a/fileTransfer/store/received.go
+++ b/fileTransfer/store/received.go
@@ -30,7 +30,7 @@ const (
 	errLoadReceived            = "error loading received transfer list from storage: %+v"
 	errUnmarshalReceived       = "could not unmarshal received transfer list: %+v"
 	warnLoadReceivedTransfer   = "[FT] failed to load received transfer %d of %d with ID %s: %+v"
-	errLoadAllReceivedTransfer = "failed to load all %d transfers"
+	errLoadAllReceivedTransfer = "failed to load all %d received transfers"
 
 	// Received.AddTransfer
 	errAddExistingReceivedTransfer = "received transfer with ID %s already exists in map."
@@ -83,7 +83,7 @@ func NewOrLoadReceived(kv *versioned.KV) (*Received, []*ReceivedTransfer, error)
 	}
 
 	// Return an error if all transfers failed to load
-	if errCount == len(tidList) {
+	if len(tidList) > 0 && errCount == len(tidList) {
 		return nil, nil, errors.Errorf(errLoadAllReceivedTransfer, len(tidList))
 	}
 
diff --git a/fileTransfer/store/sent.go b/fileTransfer/store/sent.go
index 1c4798b48c21693482f6515a73dde168c7f07bed..fe94412a774db51f30e758132a12894a81a6c7cc 100644
--- a/fileTransfer/store/sent.go
+++ b/fileTransfer/store/sent.go
@@ -31,7 +31,7 @@ const (
 	errLoadSent            = "error loading sent transfer list from storage: %+v"
 	errUnmarshalSent       = "could not unmarshal sent transfer list: %+v"
 	warnLoadSentTransfer   = "[FT] Failed to load sent transfer %d of %d with ID %s: %+v"
-	errLoadAllSentTransfer = "failed to load all %d transfers"
+	errLoadAllSentTransfer = "failed to load all %d sent transfers"
 
 	// Sent.AddTransfer
 	errAddExistingSentTransfer = "sent transfer with ID %s already exists in map."