From 22a4b00be0da418f14966f996950b55654249503 Mon Sep 17 00:00:00 2001
From: Suha Can <suhacan@microsoft.com>
Date: Mon, 29 Nov 2010 11:31:35 -0800
Subject: [PATCH] PERF: Fixing a NullReferenceException that shows up on
 startup.

--HG--
branch : perf
---
 src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
index 8e8fd8316..bc10d1252 100644
--- a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
+++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Models;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.Localization;
@@ -61,7 +62,12 @@ namespace Orchard.Core.Common.Handlers {
         public Localizer T { get; set; }
 
         bool ContentTypeWithACommonPart(string typeName) {
-            return _contentDefinitionManager.GetTypeDefinition(typeName).Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+            ContentTypeDefinition contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);
+
+            if (contentTypeDefinition != null) {
+                return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+            }
+            return false;
         }
 
         void AssignCreatingOwner(InitializingContentContext context, CommonPart part) {