diff --git a/IcsManagerLibrary/IcsManager.cs b/IcsManagerLibrary/IcsManager.cs
index b5a4ec4..154d593 100644
--- a/IcsManagerLibrary/IcsManager.cs
+++ b/IcsManagerLibrary/IcsManager.cs
@@ -17,23 +17,34 @@ from nic in NetworkInterface.GetAllNetworkInterfaces()
                 where nic.Supports(NetworkInterfaceComponent.IPv4)
                 where (nic.NetworkInterfaceType == NetworkInterfaceType.Ethernet)
                    || (nic.NetworkInterfaceType == NetworkInterfaceType.Wireless80211)
+                   || (nic.NetworkInterfaceType == NetworkInterfaceType.GigabitEthernet)
                 select nic;
         }
 
         public static NetShare GetCurrentlySharedConnections()
         {
-            INetConnection sharedConnection = (
-                from INetConnection c in SharingManager.EnumEveryConnection
-                where GetConfiguration(c).SharingEnabled
-                where GetConfiguration(c).SharingConnectionType ==
-                    tagSHARINGCONNECTIONTYPE.ICSSHARINGTYPE_PUBLIC
-                select c).DefaultIfEmpty(null).First();
-            INetConnection homeConnection = (
-                from INetConnection c in SharingManager.EnumEveryConnection
-                where GetConfiguration(c).SharingEnabled
-                where GetConfiguration(c).SharingConnectionType ==
-                    tagSHARINGCONNECTIONTYPE.ICSSHARINGTYPE_PRIVATE
-                select c).DefaultIfEmpty(null).First();
+            INetConnection sharedConnection = null;
+            INetConnection homeConnection = null;
+            INetSharingEveryConnectionCollection connections = SharingManager.EnumEveryConnection;
+            foreach (INetConnection c in connections)
+            {
+                try
+                {
+
+                    INetSharingConfiguration config = GetConfiguration(c);
+                    if (config.SharingEnabled)
+                    {
+                        if (config.SharingConnectionType == tagSHARINGCONNECTIONTYPE.ICSSHARINGTYPE_PUBLIC)
+                            sharedConnection = c;
+                        else if (config.SharingConnectionType == tagSHARINGCONNECTIONTYPE.ICSSHARINGTYPE_PRIVATE)
+                            homeConnection = c;
+                    }
+                }
+                catch (System.Runtime.InteropServices.ExternalException)
+                {
+                }
+            }
+
             return new NetShare(sharedConnection, homeConnection);
         }
 
@@ -81,16 +92,40 @@ public static INetConnection FindConnectionByIdOrName(string shared)
 
         public static INetConnection GetConnectionById(string guid)
         {
-            return (from INetConnection c in GetAllConnections()
-                    where GetProperties(c).Guid == guid
-                    select c).DefaultIfEmpty(null).First();
+            INetSharingEveryConnectionCollection connections = GetAllConnections();
+            foreach (INetConnection c in connections)
+            {
+                try
+                {
+                    INetConnectionProps props = GetProperties(c);
+                    if (props.Guid == guid)
+                        return c;
+                }
+                catch (System.Runtime.InteropServices.ExternalException)
+                { 
+                     // Ignore these  It'ts known that Tunnel adapter isatap   causes getProperties to fail. 
+                }
+            }
+            return null;
         }
 
         public static INetConnection GetConnectionByName(string name)
         {
-            return (from INetConnection c in GetAllConnections()
-                    where GetProperties(c).Name == name
-                    select c).DefaultIfEmpty(null).First();
+            INetSharingEveryConnectionCollection connections = GetAllConnections();
+            foreach (INetConnection c in connections)
+            {
+                try
+                {
+                    INetConnectionProps props = GetProperties(c);
+                    if (props.Name == name)
+                        return c;
+                }
+                catch (System.Runtime.InteropServices.ExternalException)
+                {
+                    // Ignore these  It'ts known that Tunnel adapter isatap   causes getProperties to fail. 
+                }
+            }
+            return null;
         }
 
     }