diff --git a/Shared/Models/ConnectionInfo.cs b/Shared/Models/ConnectionInfo.cs
index 55fb1ce4..5b57e4a3 100644
--- a/Shared/Models/ConnectionInfo.cs
+++ b/Shared/Models/ConnectionInfo.cs
@@ -10,11 +10,11 @@ namespace Remotely.Shared.Models
         {
             get
             {
-                return _host;
+                return _host?.Trim()?.TrimEnd('/');
             }
             set
             {
-                _host = value.Trim().TrimEnd('/');
+                _host = value?.Trim()?.TrimEnd('/');
             }
         }
         public string OrganizationID { get; set; }