diff --git a/ExternalConnectors/AWS/InstanceInfo.cs b/ExternalConnectors/AWS/InstanceInfo.cs
index eeeeee9b..53a9422b 100644
--- a/ExternalConnectors/AWS/InstanceInfo.cs
+++ b/ExternalConnectors/AWS/InstanceInfo.cs
@@ -26,8 +26,9 @@ namespace ExternalConnectors.AWS
                 default: Status = "Unknown"; break;
             };
 
-            PublicIP = instance.PublicIpAddress;
-            PrivateIP = instance.PrivateIpAddress;
+            PublicIP = instance.PublicIpAddress ?? "";
+            PrivateIP = instance.PrivateIpAddress ?? "";
+
         }
     }
 }
diff --git a/mRemoteNG/Connection/ConnectionInitiator.cs b/mRemoteNG/Connection/ConnectionInitiator.cs
index bc4f657a..da0b8145 100644
--- a/mRemoteNG/Connection/ConnectionInitiator.cs
+++ b/mRemoteNG/Connection/ConnectionInitiator.cs
@@ -67,7 +67,8 @@ namespace mRemoteNG.Connection
                     try
                     {
                         string host = await ExternalConnectors.AWS.EC2FetchDataService.GetEC2InstanceDataAsync("AWSAPI:" + connectionInfo.EC2InstanceId, connectionInfo.EC2Region);
-                        connectionInfo.Hostname = host;
+                        if (!string.IsNullOrEmpty(host))
+                            connectionInfo.Hostname = host;
                     }
                     catch
                     {