diff --git a/exec/load/json-client.js b/exec/load/json-client.js
index 7dd978a218a683c76d58f3f4a34c46a8b7a98388..3e31b5cedaecaa2182be127c87e50eb269a0a592 100644
--- a/exec/load/json-client.js
+++ b/exec/load/json-client.js
@@ -77,7 +77,7 @@ function JSONClient(serverAddr,serverPort) {
 		CONNECTION_TIMEOUT:		10,
 		PING_INTERVAL:			60*1000,
 		PING_TIMEOUT:			10*1000,
-		SOCK_TIMEOUT:			10*1000,
+		SOCK_TIMEOUT:			30*1000,
 		TIMEOUT:				-1
 	};
         
diff --git a/exec/load/json-db.js b/exec/load/json-db.js
index d769b69bd46b04bc29630d859c7fa4b44145b55a..1286e054462fbe96bec75253a3a1db08df2b67c9 100644
--- a/exec/load/json-db.js
+++ b/exec/load/json-db.js
@@ -142,7 +142,7 @@ function JSONdb (fileName) {
     /* unsubscribe a client from an object */
     this.unsubscribe = function(request,record) {
 		var client = request.client;
-		if(this.subscriptions[client.id][record.location]) {
+		if(this.subscriptions[client.id] && this.subscriptions[client.id][record.location]) {
 			delete record.shadow[record.property]._subscribers[client.id];
 			delete this.subscriptions[client.id][record.location];
 			if(count(this.subscriptions[client.id]) == 0)