From cf5714b2f83adfe28808c0eb3c0417e67edd1992 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Thu, 5 Sep 2013 09:48:07 -0700
Subject: [PATCH] Fixing NRE in Enumerate<TField>

---
 .../ContentManagement/Handlers/DescribeMembersContext.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs
index a3c0b70c5..6384653ec 100644
--- a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs
+++ b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs
@@ -39,7 +39,7 @@ namespace Orchard.ContentManagement.Handlers {
 
         public DescribeMembersContext Enumerate<TField>(Func<Func<TField, IEnumerable>> enumerate) where TField : ContentField, new() {
             
-            if (enumerate != null) {
+            if (enumerate != null && _storage != null && _apply != null) {
                 var f = enumerate();
                 var field = Activator.CreateInstance<TField>();
                 field.Storage = _storage;