diff --git a/src/Umbraco.Core/Services/TagExtractor.cs b/src/Umbraco.Core/Services/TagExtractor.cs
index 8de0c6d230..3e04517f80 100644
--- a/src/Umbraco.Core/Services/TagExtractor.cs
+++ b/src/Umbraco.Core/Services/TagExtractor.cs
@@ -15,6 +15,7 @@ namespace Umbraco.Core.Services
     {
         public static SupportTagsAttribute GetAttribute(PropertyEditor propEd)
         {
+            if (propEd == null) return null;
             var tagSupport = propEd.GetType().GetCustomAttribute<SupportTagsAttribute>(false);
             return tagSupport;
         }