update

2 files changed, 17 insertions, 4 deletions

diff --git a/mdoc/Mono.Documentation/MDocUpdater.Member.cs b/mdoc/Mono.Documentation/MDocUpdater.Member.cs
index c7c88af5..c4e63cff 100644
--- a/mdoc/Mono.Documentation/MDocUpdater.Member.cs
+++ b/mdoc/Mono.Documentation/MDocUpdater.Member.cs
@@ -10,6 +10,11 @@ namespace Mono.Documentation
     {
         internal static void MakeTypeParameterConstraints(XmlElement root, XmlElement e, XmlElement pe, GenericParameter typeParameter)
         {
+            if (typeParameter == null)
+            {
+                return;
+            }
+
 #if NEW_CECIL
             Mono.Collections.Generic.Collection<GenericParameterConstraint> constraints = typeParameter.Constraints;
 #else
@@ -63,12 +68,17 @@ namespace Mono.Documentation
             }
         }
 
-        internal static void CheckFrameworkAlternateAttribute(FrameworkTypeEntry entry, XmlElement e, string elementName)
+        internal static void CheckFrameworkAlternateAttribute(FrameworkTypeEntry entry, XmlElement element, string elementName)
         {
+            if (entry == null || element == null || string.IsNullOrEmpty(elementName))
+            {
+                return;
+            }
+
             if (entry.Framework.IsLastFrameworkForType(entry))
             {
                 var allFrameworks = entry.Framework.AllFrameworksWithType(entry);
-                var finalNodes = e.GetElementsByTagName(elementName).Cast<XmlElement>().ToArray();
+                var finalNodes = element.GetElementsByTagName(elementName).Cast<XmlElement>().ToArray();
                 foreach (var node in finalNodes)
                 {
                     // if FXAlternate is entire list, just remove it
diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs
index c5577b07..e282e03b 100644
--- a/mdoc/Mono.Documentation/MDocUpdater.cs
+++ b/mdoc/Mono.Documentation/MDocUpdater.cs
@@ -2179,9 +2179,12 @@ namespace Mono.Documentation
                 NormalizeWhitespace (ass);
             }
 
-            if (type.IsGenericType () && !DocUtils.IsDelegate(type))
+            if (type.IsGenericType ())
             {
-                MakeTypeParameters (typeEntry, root, type.GenericParameters, type, MDocUpdater.HasDroppedNamespace (type));
+                if (!DocUtils.IsDelegate(type))
+                {
+                    MakeTypeParameters(typeEntry, root, type.GenericParameters, type, MDocUpdater.HasDroppedNamespace(type));
+                }
             }
             else
             {