diff --git a/CryptoExchange.Net.UnitTests/Implementations/TestEnvironment.cs b/CryptoExchange.Net.UnitTests/Implementations/TestEnvironment.cs
index f84579c..6caeddd 100644
--- a/CryptoExchange.Net.UnitTests/Implementations/TestEnvironment.cs
+++ b/CryptoExchange.Net.UnitTests/Implementations/TestEnvironment.cs
@@ -23,7 +23,7 @@ namespace CryptoExchange.Net.UnitTests.Implementations
         { }
 
         /// <summary>
-        /// Get the CryptoCom environment by name
+        /// Get the environment by name
         /// </summary>
         public static TestEnvironment? GetEnvironmentByName(string? name)
          => name switch
diff --git a/CryptoExchange.Net.UnitTests/ParameterCollectionTests.cs b/CryptoExchange.Net.UnitTests/ParameterCollectionTests.cs
index 9853c6a..2a3f83b 100644
--- a/CryptoExchange.Net.UnitTests/ParameterCollectionTests.cs
+++ b/CryptoExchange.Net.UnitTests/ParameterCollectionTests.cs
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.UnitTests
         }
 
         [Test]
-        public void AddingBasicNullValue_ThrowExecption()
+        public void AddingBasicNullValue_ThrowsException()
         {
             var parameters = new ParameterCollection();
             Assert.Throws<ArgumentNullException>(() =>  parameters.Add("test", null!));
diff --git a/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs b/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs
index c6f0f1b..fa6ea5d 100644
--- a/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs
+++ b/CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs
@@ -230,7 +230,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
         /// <summary>
         /// Try to get the enum value based on the string value using the Utf8JsonReader's ValueTextEquals method. 
-        /// This is an optimization to avoid string allocations when possible, but can only match case insensitively
+        /// This is an optimization to avoid string allocations when possible, but can only match case sensitively
         /// </summary>
         private static T? GetValueOptimistic(ref Utf8JsonReader reader)
         {
diff --git a/CryptoExchange.Net/Sockets/Query.cs b/CryptoExchange.Net/Sockets/Query.cs
index 56b521c..60fb635 100644
--- a/CryptoExchange.Net/Sockets/Query.cs
+++ b/CryptoExchange.Net/Sockets/Query.cs
@@ -62,7 +62,7 @@ namespace CryptoExchange.Net.Sockets
 
         private MessageRouter _router;
         /// <summary>
-        /// Router for this subscription
+        /// Router for this query
         /// </summary>
         public MessageRouter MessageRouter
         {
@@ -208,12 +208,14 @@ namespace CryptoExchange.Net.Sockets
             if (CurrentResponses == RequiredResponses)
                 Response = message;
 
+            var handled = false;
             if (Result?.Success != false)
             {
                 // If an error result is already set don't override that
                 MessageRouter.Handle(typeIdentifier, topicFilter, connection, receiveTime, originalData, message, out var result);
                 Result = result;
-                if (Result == null)
+                handled = Result != null;
+                if (!handled)
                     // Null from Handle means it wasn't actually for this query
                     CurrentResponses -= 1;
             }
@@ -225,7 +227,7 @@ namespace CryptoExchange.Net.Sockets
                 OnComplete?.Invoke();
             }
 
-            return true;
+            return handled;
         }
 
         /// <inheritdoc />