diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift
index 18748f9..6f8c7e0 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift	
@@ -104,13 +104,17 @@
                                                        timingOutIn: timeout) { (receivedParameter) in
                     // Queue the results for merge.
                     parametersWorkQueue.async {
-                        if (returnedList[index] != nil) {
-                            MVMCoreLoggingHandler.addError(toLog: MVMCoreErrorObject(title: nil, message: "Client parameter \(parameterType) has already executed. The completion handler should only be called once!", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: String(describing: ClientParameterHandler.self))!)
-                        } else {
-                            MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterFetchComplete(name: parameterType, uuid: requestUUID[index], actionId: actionId))
-                            returnedList[index] = receivedParameter
-                            group.leave() // Leaving is only done after setup (barriered).
+                        guard !complete else {
+                            MVMCoreLoggingHandler.logDebugMessage(withDelegate: "Client \(parameterType) responded after task completion.")
+                            return
                         }
+                        guard returnedList[index] == nil else {
+                            MVMCoreLoggingHandler.addError(toLog: MVMCoreErrorObject(title: nil, message: "Client parameter \(parameterType) has already executed. The completion handler should only be called once!", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: String(describing: ClientParameterHandler.self))!)
+                            return
+                        }
+                        MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterFetchComplete(name: parameterType, uuid: requestUUID[index], actionId: actionId))
+                        returnedList[index] = receivedParameter
+                        group.leave() // Leaving is only done after setup (barriered).
                     }
                 }
             }