diff --git a/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift b/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
index 6378cea..dd0471a 100644
--- a/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
+++ b/MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
@@ -13,12 +13,12 @@ public extension MVMCoreActionHandler {
     ///  Iterates threw the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters.
     @objc func setClientParameter(with actionMap: [String: Any]?, completionHandler: @escaping ([String : Any]?) -> ()) {
 
-        guard let clientParameters = actionMap?.optionalDictionaryForKey("clientParameters") else {
-            completionHandler(actionMap)
+        guard let actionMap = actionMap, let clientParameters = actionMap.optionalDictionaryForKey("clientParameters") else {
+            completionHandler(nil)
             return
         }
 
-        let isBackgroudRequest = actionMap?.boolForKey("background") ?? false
+        let isBackgroudRequest = actionMap.boolForKey("background")
 
         if !isBackgroudRequest {
             MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading()
@@ -38,10 +38,10 @@ public extension MVMCoreActionHandler {
                     return
                 }
 
-                var extraParams: [String : Any] = actionMap?.dictionaryForKey(KeyExtraParameters)
+                var extraParams: [String : Any] = actionMap.dictionaryForKey(KeyExtraParameters)
                 extraParams.merge(clientParams) { (_, new) in new }
                 var actionMapM = actionMap
-                actionMapM?[KeyExtraParameters] = extraParams
+                actionMapM[KeyExtraParameters] = extraParams
 
                 stopLoadingOverlay()
                 completionHandler(actionMapM)