From 65f78c3d8d4461f4745169e6ba5e2f61bd48c809 Mon Sep 17 00:00:00 2001
From: Lombiq <github@lombiq.com>
Date: Wed, 19 Sep 2018 19:27:48 +0200
Subject: [PATCH] Orchard.Layouts: Fixing potential NRE in ContentPartDisplay
 (fixes #8110)

---
 .../Modules/Orchard.Layouts/Services/ContentPartDisplay.cs   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Services/ContentPartDisplay.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Services/ContentPartDisplay.cs
index bf44e122c..3d2adca4d 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Services/ContentPartDisplay.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Services/ContentPartDisplay.cs
@@ -67,9 +67,8 @@ namespace Orchard.Layouts.Services {
             return context.Shape;
         }
 
-        private IEnumerable<IContentPartDriver> GetPartDrivers(string partName) {
-            return _contentPartDrivers.Where(x => GetPartOfDriver(x.GetType().BaseType).Name == partName);
-        }
+        private IEnumerable<IContentPartDriver> GetPartDrivers(string partName) =>
+            _contentPartDrivers.Where(x => GetPartOfDriver(x.GetType()?.BaseType)?.Name == partName);
 
         private Type GetPartOfDriver(Type type) {
             var baseType = type;