diff --git a/cmd/sendaround/main.go b/cmd/sendaround/main.go
index 0229b6d..3133b86 100644
--- a/cmd/sendaround/main.go
+++ b/cmd/sendaround/main.go
@@ -82,8 +82,11 @@ func main() {
 						pbars[state.CurrentFile.FileName()].Start()
 					}
 					pbars[state.CurrentFile.FileName()].SetCurrent(int64(state.TransmittedLength))
-					if state.TransmittedLength == state.CurrentFile.Length() {
-						pbars[state.CurrentFile.FileName()].Finish()
+				case sendaround.Connected:
+					if state.CurrentFile != nil { // Was a file transferred successfully just now?
+						if state.TransmittedLength == state.CurrentFile.Length() {
+							pbars[state.CurrentFile.FileName()].Finish()
+						}
 					}
 				case sendaround.Failed:
 					log.Fatal(state.Error)
@@ -161,8 +164,11 @@ func main() {
 					pbars[state.CurrentFile.FileName()].Start()
 				}
 				pbars[state.CurrentFile.FileName()].SetCurrent(int64(state.TransmittedLength))
-				if state.TransmittedLength == state.CurrentFile.Length() {
-					pbars[state.CurrentFile.FileName()].Finish()
+			case sendaround.Connected:
+				if state.CurrentFile != nil { // Was a file transferred successfully just now?
+					if state.TransmittedLength == state.CurrentFile.Length() {
+						pbars[state.CurrentFile.FileName()].Finish()
+					}
 				}
 			case sendaround.Failed:
 				log.Fatal("Failed:", state.Error)