diff --git a/OpenMetaverse/Capabilities/HttpServer.cs b/OpenMetaverse/Capabilities/HttpServer.cs
index 07191b46..241d0912 100644
--- a/OpenMetaverse/Capabilities/HttpServer.cs
+++ b/OpenMetaverse/Capabilities/HttpServer.cs
@@ -157,11 +157,21 @@ namespace OpenMetaverse.Capabilities
                             }
                             catch (Exception e)
                             {
-                                context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-                                context.Response.StatusDescription = e.ToString();
+                                try
+                                {
+                                    context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                                    context.Response.StatusDescription = e.ToString();
+                                }
+                                catch (Exception)
+                                {
+                                    Logger.Log(e.ToString(), Helpers.LogLevel.Error);
+                                }
+                            }
+                            finally
+                            {
+                                context.Response.Close();
                             }
 
-                            context.Response.Close();
                             return;
                         }
                     }
diff --git a/OpenMetaverse/Types/UUID.cs b/OpenMetaverse/Types/UUID.cs
index 3ee2ef44..4e27f1a0 100644
--- a/OpenMetaverse/Types/UUID.cs
+++ b/OpenMetaverse/Types/UUID.cs
@@ -208,6 +208,12 @@ namespace OpenMetaverse
         /// <example>UUID.TryParse("11f8aa9c-b071-4242-836b-13b7abe0d489", result)</example>
         public static bool TryParse(string val, out UUID result)
         {
+            if (String.IsNullOrEmpty(val))
+            {
+                result = UUID.Zero;
+                return false;
+            }
+
             try
             {
                 result = Parse(val);