Additional null checks

OurUmbraco.Site/Views/DisplayTopic.cshtml

@@ -41,7 +41,7 @@
         {
             memberRoles.Add(topic.MemberId, topicAuthor.GetRoles());
         }
-        
+
         foreach (var comment in topic.Comments)
         {
             if (topicMembers.Any(x => x.Id == comment.MemberId) == false)
@@ -59,14 +59,17 @@
                 else
                 {
                     commentAuthor = Members.GetById(comment.MemberId);
-                    if (memberRoles.ContainsKey(comment.MemberId) == false)
+                    if (commentAuthor != null && memberRoles.ContainsKey(comment.MemberId) == false)
                     {
                         var roles = commentAuthor.GetRoles();
                         memberRoles.Add(comment.MemberId, roles);
                     }
-
                 }
-                topicMembers.Add(commentAuthor);
+
+                if (commentAuthor != null)
+                {
+                    topicMembers.Add(commentAuthor);
+                }
             }
         }
     }

OurUmbraco/Forum/Extensions/ForumExtensions.cs

@@ -163,9 +163,16 @@ namespace OurUmbraco.Forum.Extensions
 
             var memberRoles = new List<string>();
 
+            if (roles == null)
+                return memberRoles;
+
             foreach (var role in roles)
             {
-                if (role == "standard" || role.StartsWith("201") || role.ToLowerInvariant().Contains("vendor".ToLowerInvariant()) || role.ToLowerInvariant().Contains("wiki".ToLowerInvariant()) || role.ToLowerInvariant().Contains("potentialspam".ToLowerInvariant()) || role.ToLowerInvariant().Contains("newaccount".ToLowerInvariant()))
+                if (role == "standard" || role.StartsWith("201") ||
+                    role.ToLowerInvariant().Contains("vendor".ToLowerInvariant()) ||
+                    role.ToLowerInvariant().Contains("wiki".ToLowerInvariant()) ||
+                    role.ToLowerInvariant().Contains("potentialspam".ToLowerInvariant()) ||
+                    role.ToLowerInvariant().Contains("newaccount".ToLowerInvariant()))
                     continue;
 
                 if (role == "CoreContrib")