From 53ab8845e6ae611945cc18413fcf0584e01a41b4 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Fri, 19 Dec 2014 23:55:20 +0100
Subject: [PATCH] Handling null content case.

---
 .../Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs
index 982822f63..840118e49 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ContentItemDriver.cs
@@ -38,7 +38,7 @@ namespace Orchard.Layouts.Drivers {
         }
 
         protected override void OnDisplaying(ContentItem element, ElementDisplayContext context) {
-            var contentItemIds = RemoveCurrentContentItemId(element.ContentItemIds, context.Content.Id);
+            var contentItemIds = context.Content != null ? RemoveCurrentContentItemId(element.ContentItemIds, context.Content.Id) : element.ContentItemIds;
             var displayType = element.DisplayType;
             var contentItems = GetContentItems(contentItemIds).ToArray();
             var contentItemShapes = contentItems.Select(x => _contentManager.BuildDisplay(x, displayType)).ToArray();