diff --git a/DNN Platform/Library/Services/Search/Internals/LuceneControllerImpl.cs b/DNN Platform/Library/Services/Search/Internals/LuceneControllerImpl.cs
index 1ea449619af..8edc5d22bce 100644
--- a/DNN Platform/Library/Services/Search/Internals/LuceneControllerImpl.cs	
+++ b/DNN Platform/Library/Services/Search/Internals/LuceneControllerImpl.cs	
@@ -378,11 +378,11 @@ public Analyzer GetCustomAnalyzer()
                         var analyzerType = Reflection.CreateType(customAnalyzerType);
 
                         // If parameterless ctor exists, use that; if not, pass the Lucene Version.
-                        if (analyzerType.GetConstructor(Type.EmptyTypes) != null)
+                        if (analyzerType?.GetConstructor(Type.EmptyTypes) != null)
                         {
                             analyzer = Reflection.CreateInstance(analyzerType) as Analyzer;
                         }
-                        else if (analyzerType.GetConstructor(new Type[] { typeof(Lucene.Net.Util.Version) }) != null)
+                        else if (analyzerType?.GetConstructor(new Type[] { typeof(Lucene.Net.Util.Version) }) != null)
                         {
                             analyzer = Reflection.CreateInstance(analyzerType, new object[] { Constants.LuceneVersion }) as Analyzer;
                         }
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Framework/ReflectionTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Framework/ReflectionTests.cs
index 4e887217bdd..063226fe2e2 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Framework/ReflectionTests.cs	
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Framework/ReflectionTests.cs	
@@ -11,13 +11,13 @@ public void CreateInstance_WithArgs_WorksCorrectly()
         {
             // Arrange
             var typeToCreate = typeof(StringBuilder);
-            var argToPass = new object[] { 1 };
+            var argToPass = new object[] { "one" };
 
             // Act
-            var result = Reflection.CreateInstance(typeToCreate, argToPass) as StringBuilder;
+            var result = (StringBuilder)Reflection.CreateInstance(typeToCreate, argToPass);
 
             // Assert
-            Assert.AreEqual(1, result.Capacity);
+            Assert.AreEqual("one", result.ToString());
         }
 
         [Test]
@@ -27,10 +27,10 @@ public void CreateInstance_WithoutArgs_WorksCorrectly()
             var typeToCreate = typeof(StringBuilder);
 
             // Act
-            var result = Reflection.CreateInstance(typeToCreate) as StringBuilder;
+            var result = (StringBuilder)Reflection.CreateInstance(typeToCreate);
 
             // Assert
-            Assert.AreEqual(16, result.Capacity);
+            Assert.AreEqual(string.Empty, result.ToString());
         }
     }
 }