From 05ffcdeef77e44963535f62ca9868c8e854bb31d Mon Sep 17 00:00:00 2001
From: tecxx <tecxx@rrs.at>
Date: Thu, 23 Dec 2021 16:54:54 +0100
Subject: fix null object bug in ec2 connector

---
 ExternalConnectors/AWS/InstanceInfo.cs      | 5 +++--
 mRemoteNG/Connection/ConnectionInitiator.cs | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

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
                     {
-- 
cgit v1.2.3