From 9e88d16273031cb8c35853571a4e3cd6191d5f6b Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Sat, 13 Jun 2015 19:11:25 +0300
Subject: [PATCH] Added missing null check to Projection element driver's
 export method.

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

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
index ebfb44807..2e25dfea8 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/ProjectionElementDriver.cs
@@ -288,7 +288,7 @@ namespace Orchard.Layouts.Drivers {
 
         protected override void OnExporting(Projection element, ExportElementContext context) {
             var query = element.QueryId != null ? _contentManager.Get<QueryPart>(element.QueryId.Value) : default(QueryPart);
-            var layout = element.LayoutId != null ? _layoutRepository.Get(element.LayoutId.Value) : default(LayoutRecord);
+            var layout = query != null && element.LayoutId != null ? _layoutRepository.Get(element.LayoutId.Value) : default(LayoutRecord);
             var queryIdentity = query != null ? _contentManager.GetItemMetadata(query).Identity.ToString() : default(string);
             var layoutIndex = layout != null ? query.Layouts.IndexOf(layout) : default(int?);