diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index 7caec71ed3..64ea920943 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -280,7 +280,9 @@ namespace Umbraco.Core.Services
             contentType.Icon = infoElement.Element("Icon").Value;
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
-            contentType.AllowedAsRoot = infoElement.Element("AllowAtRoot").Value.ToLowerInvariant().Equals("true");
+            //NOTE AllowAtRoot is a new property in the package xml so we need to verify it exists before using it.
+            if (infoElement.Element("AllowAtRoot") != null)
+                contentType.AllowedAsRoot = infoElement.Element("AllowAtRoot").Value.ToLowerInvariant().Equals("true");
 
             UpdateContentTypesAllowedTemplates(contentType, infoElement.Element("AllowedTemplates"), defaultTemplateElement);
             UpdateContentTypesTabs(contentType, documentType.Element("Tab"));
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 30e41b4bea..b4b6a2722b 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -475,11 +475,13 @@ namespace umbraco.cms.businesslogic.packager
                 #endregion
 
                 #region Documents
-                var documentElement = rootElement.Descendants("DocumentSet").First();
-                var content = packagingService.ImportContent(documentElement, -1, currentUser.Id);
-                var firstContentItem = content.First();
-                insPack.Data.ContentNodeId = firstContentItem.Id.ToString(CultureInfo.InvariantCulture);
-
+                var documentElement = rootElement.Descendants("DocumentSet").FirstOrDefault();
+                if (documentElement != null)
+                {
+                    var content = packagingService.ImportContent(documentElement, -1, currentUser.Id);
+                    var firstContentItem = content.First();
+                    insPack.Data.ContentNodeId = firstContentItem.Id.ToString(CultureInfo.InvariantCulture);
+                }
                 /*foreach (XmlElement n in _packageConfig.DocumentElement.SelectNodes("Documents/DocumentSet [@importMode = 'root']/*"))
                 {
                     insPack.Data.ContentNodeId = cms.businesslogic.web.Document.Import(-1, currentUser, n).ToString();