From a9ceb82158fcddd88406d5e19bacb0bac5edf407 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 5 Apr 2019 15:18:34 +0200
Subject: [PATCH] Don't explode when attempting to create a new content type
 with a template (mapping issue)

---
 .../Models/Mapping/ContentTypeMapDefinition.cs            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
index 3d4ed5350e..7007ca7674 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
@@ -246,7 +246,13 @@ namespace Umbraco.Web.Models.Mapping
             {
                 var templates = _fileService.GetTemplates(source.AllowedTemplates.ToArray());
                 target.AllowedTemplates = source.AllowedTemplates
-                    .Select(x => context.Mapper.Map<EntityBasic>(templates.SingleOrDefault(t => t.Alias == x)))
+                    .Select(x =>
+                    {
+                        var template = templates.SingleOrDefault(t => t.Alias == x);
+                        return template != null
+                            ? context.Mapper.Map<EntityBasic>(template)
+                            : null;
+                    })
                     .WhereNotNull()
                     .ToArray();
             }