diff --git a/ResourceManager/ResourceManager.cpp b/ResourceManager/ResourceManager.cpp
index 6474df67b0..bba6934849 100644
--- a/ResourceManager/ResourceManager.cpp
+++ b/ResourceManager/ResourceManager.cpp
@@ -396,6 +396,11 @@ namespace WPEFramework {
                     }
                 }
             }
+            
+	    if (!FromMessage(response, message, isResponseString))
+            {
+                return Core::ERROR_GENERAL;
+            }
 #elif (THUNDER_VERSION == 2)
             auto resp =  dispatcher_->Invoke(sThunderSecurityToken, channelId, *message);
 #else
diff --git a/SystemServices/platformcaps/platformcapsdata.h b/SystemServices/platformcaps/platformcapsdata.h
index f346c3df93..1930ceea40 100644
--- a/SystemServices/platformcaps/platformcapsdata.h
+++ b/SystemServices/platformcaps/platformcapsdata.h
@@ -193,6 +193,11 @@ class PlatformCapsData {
                     }
                 }
             }
+            
+	    if (!FromMessage(response, message, isResponseString))
+            {
+                return Core::ERROR_GENERAL;
+            }
 #elif ((THUNDER_VERSION >= 4) && (THUNDER_VERSION_MINOR == 2))
         Core::JSONRPC::Context context(channelId, message->Id.Value(), "");
         auto resp = dispatcher_->Invoke(context, *message);