diff --git a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
index 01f6fb1..0f180c9 100644
--- a/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWBrokerRecvTask.cpp
@@ -104,7 +104,7 @@ void BrokerRecvTask::run(void)
 			{
 				client = _gateway->getClientList()->getClient(0);
 
-				while (client > 0)
+				while ( client )
 				{
 					_light->blueLight(false);
 					if (client->getNetwork()->isValid())
diff --git a/MQTTSNGateway/src/MQTTSNGateway.cpp b/MQTTSNGateway/src/MQTTSNGateway.cpp
index 25ab87f..46d4281 100644
--- a/MQTTSNGateway/src/MQTTSNGateway.cpp
+++ b/MQTTSNGateway/src/MQTTSNGateway.cpp
@@ -191,11 +191,6 @@ void Gateway::initialize(int argc, char** argv)
 		_params.keepAlive = atoi(param);
 	}
 
-	if (_params.keepAlive > 65536)
-	{
-		throw Exception("Gateway::initialize: KeepAliveTime is grater than 65536 Secs");
-	}
-
 	if (getParam("LoginID", param) == 0)
 	{
 		_params.loginId = strdup(param);