Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7

2017-08-03 01:27:38 +10:00
parent a3cf41284b 2907b0dd1a
commit 23e16a9182
1 changed files with 3 additions and 2 deletions
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1161,8 +1161,9 @@ namespace Umbraco.Core.Services
            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
            {
                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
-                var blueprint = repository.Get(id);
-                ((Content) blueprint).IsBlueprint = true;
+                var blueprint = repository.Get(id);
+                if (blueprint != null)
+                    ((Content) blueprint).IsBlueprint = true;
                return blueprint;
            }
        }