From e12a068128d82e5b13745f0598bf32e85eab8399 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Wed, 16 Aug 2023 10:21:02 +0200
Subject: [PATCH] Fixed nil exception

---
 commands/upload/upload.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/commands/upload/upload.go b/commands/upload/upload.go
index 920248992ae..5f2755e6dad 100644
--- a/commands/upload/upload.go
+++ b/commands/upload/upload.go
@@ -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(