diff --git a/Lidgren.Network/NetPeer.Internal.cs b/Lidgren.Network/NetPeer.Internal.cs
index 42b200b..9a82290 100644
--- a/Lidgren.Network/NetPeer.Internal.cs
+++ b/Lidgren.Network/NetPeer.Internal.cs
@@ -408,7 +408,7 @@ namespace Lidgren.Network
 					try
 					{
 						string resp = System.Text.Encoding.ASCII.GetString(m_receiveBuffer, 0, bytesReceived);
-						if (resp.Contains("upnp:rootdevice"))
+						if (resp.Contains("upnp:rootdevice") || resp.Contains("UPnP/1.0"))
 						{
 							resp = resp.Substring(resp.ToLower().IndexOf("location:") + 9);
 							resp = resp.Substring(0, resp.IndexOf("\r")).Trim();
diff --git a/Lidgren.Network/NetUPnP.cs b/Lidgren.Network/NetUPnP.cs
index 35a5fe8..e4cdf8b 100644
--- a/Lidgren.Network/NetUPnP.cs
+++ b/Lidgren.Network/NetUPnP.cs
@@ -114,7 +114,11 @@ namespace Lidgren.Network
 			m_discoveryComplete.Set();
 #if !DEBUG
 			}
-			catch { return; }
+			catch
+			{
+				m_peer.LogVerbose("Exception ignored trying to parse UPnP XML response");
+				return;
+			}
 #endif
 		}