diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
index 6c8c548..f3d80bb 100644
--- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
@@ -1523,12 +1523,17 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 						}
 						for (Object tempObject : uriVariables) {
 							String urlVaribleId = (String) tempObject;
-							String uriVariable = (String) jsonObject.get(urlVaribleId);
+							String uriVariable = null;
+							if( jsonObject != null ) {
+							    uriVariable = (String) jsonObject.get(urlVaribleId);
+							    jsonObject.remove(urlVaribleId);
+							}
+							
 							if (StringUtils.isBlank(uriVariable) && inboundPathVariables.containsKey(urlVaribleId)) {
 								uriVariable = inboundPathVariables.get(urlVaribleId);
 							}
 							urlVariableList.add(uriVariable);
-							jsonObject.remove(urlVaribleId);
+							
 						}
 					} else if (MessageType.XML.equals(messageType)) {
 						Document doc;
diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java
index 94ef194..7cf71d2 100644
--- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java
+++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java
@@ -131,7 +131,7 @@ public class HttpAdapterServiceBypass extends HttpAdapterServiceSupport {
 			prop.put(INBOUND_URI, request.getRequestURI());
 			prop.put(INBOUND_QUERY_STRING, StringUtils.defaultString(request.getQueryString()));
 			prop.put(INBOUND_HEADER, getHeaders(request));
-			prop.put(INBOUND_EXTPARAMS, request.getQueryString());
+			prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
 			if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
 					|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
 				// /api/v1/public/getUserInfo.svc
diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java
index 070d99b..3f3e9af 100644
--- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java
+++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java
@@ -275,7 +275,7 @@ public class HttpAdapterServiceRest extends HttpAdapterServiceSupport {
 			prop = new Properties();
 			prop.put(INBOUND_METHOD, request.getMethod());
 			prop.put(INBOUND_URI, request.getRequestURI());
-			prop.put(INBOUND_EXTPARAMS, request.getQueryString());
+			prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
 			prop.put(INBOUND_HEADER, getHeaders(request));
 			if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
 					|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java
index b78408f..0dffb4f 100644
--- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java
+++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java
@@ -172,7 +172,7 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
             prop.put(INBOUND_METHOD, request.getMethod());
 			prop.put(INBOUND_URI, request.getRequestURI());
 			prop.put(INBOUND_HEADER, getHeaders(request));
-			prop.put(INBOUND_EXTPARAMS, request.getQueryString());
+			prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
 			if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
 					|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
 				// /api/v1/public/getUserInfo.svc