From 2b61e3368d06a9a4143fcc6962870fb2b436f445 Mon Sep 17 00:00:00 2001
From: Thierry Fleury <thierry@codinlab.fr>
Date: Thu, 3 Sep 2015 11:01:18 +0200
Subject: [PATCH] Fixes #5737 : ChangeListView throws NRE on unpublished Lists

---
 .../Modules/Orchard.Lists/Controllers/AdminController.cs    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
index dafcf5dd8..b67df768d 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
@@ -380,7 +380,11 @@ namespace Orchard.Lists.Controllers {
         [HttpPost, ActionName("List")]
         [FormValueRequired("listViewName")]
         public ActionResult ChangeListView(int containerId, string listViewName, PagerParameters pagerParameters) {
-            var container = _containerService.Get(containerId);
+            var container = _containerService.Get(containerId, VersionOptions.Latest);
+            if (container == null || !container.Has<ContainerPart>()) {
+                return HttpNotFound();
+            }
+
             container.Record.AdminListViewName = listViewName;
             return RedirectToAction("List", new { containerId, page = pagerParameters.Page, pageSize = pagerParameters.PageSize });
         }