arduino
diff --git a/‎commands/upload/upload.go
Copy file name to clipboardExpand all lines: commands/upload/upload.go
+5-1Lines changed: 5 additions & 1 deletion b/‎commands/upload/upload.go
Copy file name to clipboardExpand all lines: commands/upload/upload.go
+5-1Lines changed: 5 additions & 1 deletion
@@ -512,7 +512,11 @@ func runProgramAction(pme *packagemanager.Explorer,
 	uploadCompleted()
 	logrus.Tracef("Upload successful")
 
-	return updatedUploadPort.Await().ToRPC(), nil
+	updatedPort := updatedUploadPort.Await()
+	if updatedPort == nil {
+		return nil, nil
+	}
+	return updatedPort.ToRPC(), nil
 }
 
 func detectUploadPort(