diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index db54c39..61a4a27 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -47,5 +47,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.0")]
-[assembly: AssemblyFileVersion("0.2.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyFileVersion("0.2.1.0")]
diff --git a/Tmds/MDns/NetworkInterfaceHandler.cs b/Tmds/MDns/NetworkInterfaceHandler.cs
index c66d54c..ed8d2ab 100644
--- a/Tmds/MDns/NetworkInterfaceHandler.cs
+++ b/Tmds/MDns/NetworkInterfaceHandler.cs
@@ -20,6 +20,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Threading;
 
@@ -222,6 +223,10 @@ private void OnReceive(IAsyncResult ar)
                             IPAddress address = reader.ReadARecord();
                             if (address.AddressFamily == AddressFamily.InterNetworkV6)
                             {
+                                if (!NetworkInterface.Information.Supports(NetworkInterfaceComponent.IPv6))
+                                {
+                                    continue;
+                                }
                                 address.ScopeId = NetworkInterface.Information.GetIPProperties().GetIPv6Properties().Index;
                             }
                             OnARecord(recordHeader.Name, address, recordHeader.Ttl);