diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index af700d09cc..3a9d9dcd0f 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -1631,7 +1631,7 @@ namespace Umbraco.Core.Services
             xml.Add(new XElement("Design", new XCData(template.Content)));
 
             var concreteTemplate = template as Template;
-            if (concreteTemplate != null)
+            if (concreteTemplate != null && concreteTemplate.MasterTemplateId != null)
             {
                 if (concreteTemplate.MasterTemplateId.IsValueCreated &&
                     concreteTemplate.MasterTemplateId.Value != default(int))