diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs
index ec679fae..5d81ead2 100644
--- a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs	
+++ b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs	
@@ -119,6 +119,9 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		~ComPortController()
 		{
+			if (Port == null)
+				return;
+
 			Port.SerialDataReceived -= Port_SerialDataReceived;
 		}
 
@@ -156,6 +159,9 @@ namespace PepperDash.Essentials.Core
 		/// <inheritdoc />
 		public override bool Deactivate()
 		{
+			if (Port == null)
+				return false;
+
 			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
 		}