diff --git a/Src/Asp.NetCore2/MongoDb.Ado.data/Common/MongoDbMethodUtils.cs b/Src/Asp.NetCore2/MongoDb.Ado.data/Common/MongoDbMethodUtils.cs
index 54d1ad8e9..a9fcf8763 100644
--- a/Src/Asp.NetCore2/MongoDb.Ado.data/Common/MongoDbMethodUtils.cs
+++ b/Src/Asp.NetCore2/MongoDb.Ado.data/Common/MongoDbMethodUtils.cs
@@ -7,7 +7,7 @@ namespace MongoDb.Ado.data
 {
     public class MongoDbMethodUtils
     { 
-        public void ValidateOperation(string operation)
+        public static void ValidateOperation(string operation)
         {
             if (ExecuteHandlerFactory.Items.TryGetValue(operation, out var handler))
             {
diff --git a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItems/DbDataReaderFactory.cs b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItems/DbDataReaderFactory.cs
index 36eb97b34..728860e54 100644
--- a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItems/DbDataReaderFactory.cs
+++ b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItems/DbDataReaderFactory.cs
@@ -19,6 +19,7 @@ namespace MongoDb.Ado.data
             };
         public DbDataReader Handle(string operation, IMongoCollection<BsonDocument> collection, string json)
         {
+            MongoDbMethodUtils.ValidateOperation(operation);
             var doc = MongoDB.Bson.Serialization.BsonSerializer.Deserialize<BsonValue>(json);
             DbDataReaderFactory.Items.TryGetValue(operation, out var handler);
             if (handler==null)
diff --git a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactory.cs b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactoryAsync.cs
similarity index 95%
rename from Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactory.cs
rename to Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactoryAsync.cs
index 024c76e78..4d147df4f 100644
--- a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactory.cs
+++ b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactoryAsync.cs
@@ -20,6 +20,7 @@ namespace MongoDb.Ado.data
             };
         public async Task<DbDataReader> HandleAsync(string operation, IMongoCollection<BsonDocument> collection, string json)
         {
+            MongoDbMethodUtils.ValidateOperation(operation);
             var doc = MongoDB.Bson.Serialization.BsonSerializer.Deserialize<BsonValue>(json);
             DbDataReaderFactoryAsync.Items.TryGetValue(operation, out var handler);
             if (handler == null)
diff --git a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/ExecuteHandlerFactory.cs b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/ExecuteHandlerFactory.cs
index 9ca650903..f95e9491c 100644
--- a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/ExecuteHandlerFactory.cs
+++ b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/ExecuteHandlerFactory.cs
@@ -23,6 +23,7 @@ namespace MongoDb.Ado.data
 
         public static int Handler(string operation, string json, IMongoCollection<BsonDocument> collection)
         {
+            MongoDbMethodUtils.ValidateOperation(operation);
             var handlers = ExecuteHandlerFactory.Items;
 
             if (!handlers.TryGetValue(operation, out var handler))
diff --git a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactory.cs b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactoryAsync.cs
similarity index 95%
rename from Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactory.cs
rename to Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactoryAsync.cs
index bf260aa33..efaf368ba 100644
--- a/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactory.cs
+++ b/Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactoryAsync.cs
@@ -24,6 +24,7 @@ namespace MongoDb.Ado.data
 
         public static Task<int> HandlerAsync(string operation, string json, IMongoCollection<BsonDocument> collection)
         {
+            MongoDbMethodUtils.ValidateOperation(operation);
             var handlers = ExecuteHandlerFactoryAsync.Items;
 
             if (!handlers.TryGetValue(operation, out var handler))