diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
index b14a66967..b1671cc44 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
+            <version>${analytics.json.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
index 78c873a55..8f68577a6 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
@@ -18,6 +18,7 @@
 
 package org.wso2.extension.siddhi.execution.json;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;
@@ -68,10 +69,13 @@ public class getPropertyFunctionExtension extends FunctionExecutor {
         }
         String jsonString = (String) data[0];
         String property = (String) data[1];
-
-        JSONObject jsonObject = new JSONObject(jsonString);
-        Object value = jsonObject.get(property).toString();
-        return value;
+        JSONObject jsonObject = null;
+        try {
+            jsonObject = new JSONObject(jsonString);
+            return jsonObject.get(property).toString();
+        } catch (JSONException e) {
+            throw new ExecutionPlanRuntimeException("Cannot parse JSON String in json:getPeroperty() function. " + e);
+        }
     }
 
     @Override
diff --git a/features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
index 5c572f2c2..09380ecf4 100644
--- a/features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
@@ -65,7 +65,6 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json:${carbon.devicemgt.plugins.version}
                                 </bundleDef>
-                                <bundleDef>org.json.wso2:json:${commons-json.version}</bundleDef>
                             </bundles>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index e2d044cce..f6181f323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,7 +856,6 @@
                 <artifactId>gcm-server</artifactId>
                 <version>${gcm.server.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.json.wso2</groupId>
                 <artifactId>json</artifactId>
@@ -1377,6 +1376,7 @@
         <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
         <siddhi.version>3.1.2</siddhi.version>
         <maven.scr.version>1.7.2</maven.scr.version>
+        <analytics.json.version>2.0.0.wso2v1</analytics.json.version>
     </properties>
 
     <scm>