diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift
index fe420ef..d621115 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift	
@@ -88,19 +88,31 @@
                     complete = true
                 }
             }
+            
+            guard self.parameterHandlerList.count > 0 else {
+                completionHandler(nil)
+                return
+            }
 
             // Setup timeout.
             self.parametersWorkQueue.asyncAfter(deadline: .now() + .seconds(Int(timeout)), execute: timeoutWorkItem)
 
+            self.group.enter()
+            
             // Setup the parameter execution.
             for (index, parameterHandler) in self.parameterHandlerList.enumerated() {
-                self.group.enter()
+                let parameterType = parameterHandler.clientParameterModel.type
                 parameterHandler.fetchClientParameters(requestParameters: requestParameters,
                                                        timingOutIn: timeout) { (receivedParameter) in
                     // Queue the results for merge.
                     self.parametersWorkQueue.async {
+                        if (returnedList[index] != nil) {
+                            MVMCoreLoggingHandler.shared()?.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))!)
+                        }
                         returnedList[index] = receivedParameter
-                        self.group.leave() // Leaving is only done after setup (barriered).
+                        if (returnedList.allSatisfy { $0 != nil }) {
+                            self.group.leave() // Leaving is only done after setup (barriered).
+                        }
                     }
                 }
             }