From 59b1a92cba888de43c5a507117a091725f33e32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 8 Apr 2018 21:07:20 +0300
Subject: [PATCH] Check null for type in ConventionalRegistrarBase

---
 .../Abp/DependencyInjection/ConventionalRegistrarBase.cs   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs b/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
index 2995eba4e9..f9cbf3c13c 100644
--- a/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
+++ b/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
@@ -13,12 +13,13 @@ namespace Volo.Abp.DependencyInjection
             var types = AssemblyHelper
                 .GetAllTypes(assembly)
                 .Where(
-                    type => type.IsClass &&
+                    type => type != null &&
+                            type.IsClass &&
                             !type.IsAbstract &&
                             !type.IsGenericType
-                );
+                ).ToArray();
 
-            AddTypes(services, types.ToArray());
+            AddTypes(services, types);
         }
 
         public virtual void AddTypes(IServiceCollection services, params Type[] types)