From 436875e8ec08a4e1d6ea7d092d8fb213e099ad96 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 29 Dec 2016 14:02:15 +1100 Subject: [PATCH] fixes null check with setting master template --- src/Umbraco.Web/Editors/TemplateController.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs index 633e4611e1..e937024250 100644 --- a/src/Umbraco.Web/Editors/TemplateController.cs +++ b/src/Umbraco.Web/Editors/TemplateController.cs @@ -98,11 +98,13 @@ namespace Umbraco.Web.Editors if (changeMaster) { - ITemplate master = null; if (string.IsNullOrEmpty(display.MasterTemplateAlias) == false) { - master = Services.FileService.GetTemplate(display.MasterTemplateAlias); - template.SetMasterTemplate(master); + var master = Services.FileService.GetTemplate(display.MasterTemplateAlias); + if (master != null) + { + template.SetMasterTemplate(master); + } } }