From c5f93cc78928c2afbd5c083043fb57bf6cde1592 Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Mon, 1 Mar 2010 16:24:32 -0800
Subject: [PATCH] - Fixing  16254: Make BuildEditorModel resilient to invalid
 content item ID

--HG--
branch : dev
---
 .../ContentManagement/ContentExtensions.cs       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Orchard/ContentManagement/ContentExtensions.cs b/src/Orchard/ContentManagement/ContentExtensions.cs
index 139cfd870..1449c2aa4 100644
--- a/src/Orchard/ContentManagement/ContentExtensions.cs
+++ b/src/Orchard/ContentManagement/ContentExtensions.cs
@@ -166,15 +166,25 @@ namespace Orchard.ContentManagement {
         /* Display and editor convenience extension methods */
 
         public static ContentItemViewModel<T> BuildDisplayModel<T>(this IContentManager manager, int id, string displayType) where T : class, IContent {
-            return manager.BuildDisplayModel(manager.Get<T>(id), displayType);
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.BuildDisplayModel(content, displayType);
         }
 
         public static ContentItemViewModel<T> BuildEditorModel<T>(this IContentManager manager, int id) where T : class, IContent {
-            return manager.BuildEditorModel(manager.Get<T>(id));
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.BuildEditorModel(content);
+
         }
 
         public static ContentItemViewModel<T> UpdateEditorModel<T>(this IContentManager manager, int id, IUpdateModel updater) where T : class, IContent {
-            return manager.UpdateEditorModel(manager.Get<T>(id), updater);
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.UpdateEditorModel(content, updater);
         }