--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCAPIConnectionJni.cpp	Tue Feb 09 08:09:33 2010 -0600
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCAPIConnectionJni.cpp	Wed Feb 10 13:33:18 2010 -0600
@@ -84,6 +84,13 @@
 	TCDEBUGOPEN();
 
 	TCDEBUGLOGS("nativeConnect\n");
+	if (!gManager->IsServerRunning())
+	{
+		TCDEBUGLOGS("Server not running\n");
+		TCDEBUGCLOSE();
+		return TCAPI_ERR_COMM_SERVER_RESPONSE_TIMEOUT;
+	}
+
 
 	gManager->m_Server->WaitforServerPipeAccess();
 
@@ -1255,6 +1262,13 @@
 	TCDEBUGOPEN();
 	TCDEBUGLOGS("nativeSendMessage\n");
 	TCDEBUGLOGA1(" inClientId=%d\n", inClientId);
+	if (!gManager->IsServerRunning())
+	{
+		// return right away if TCFServer is dead
+		TCDEBUGLOGS("nativeSendMessage: server is dead\n");
+		TCDEBUGCLOSE();
+		return TCAPI_ERR_COMM_SERVER_RESPONSE_TIMEOUT;
+	}
 
 	gManager->m_Server->WaitforServerPipeAccess();