diff --git a/p2pproxy/launcher/src/p2pproxy.c b/p2pproxy/launcher/src/p2pproxy.c
index 224ad443f..05574c55f 100644
--- a/p2pproxy/launcher/src/p2pproxy.c
+++ b/p2pproxy/launcher/src/p2pproxy.c
@@ -174,11 +174,18 @@ int p2pproxy_resourcemgt_revoke_sip_proxy(const char* proxy_uri) {
 	(*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm);
 	return lResult;
 }
+
 int p2pproxy_application_get_state() {
 	jmethodID stateMethod;
 	GET_JNI_ENV
 	stateMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "getState", "()I");
+	if (stateMethod==NULL) {
+		lResult=P2PPROXY_ERROR_APPLICATION_NOT_STARTED;
+		goto end;
+	}
 	lResult = (*lJniEnv)->CallStaticIntMethod(lJniEnv, lMainClass, stateMethod);
+	goto end;
+	end:
 	(*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm);
 	return lResult;
 	
diff --git a/p2pproxy/plugin-src/fonis.c b/p2pproxy/plugin-src/fonis.c
index dd207c55b..230eb8faa 100644
--- a/p2pproxy/plugin-src/fonis.c
+++ b/p2pproxy/plugin-src/fonis.c
@@ -29,7 +29,8 @@ static ms_thread_t fonis_thread;
 
 
 static void *fonis_thread_func(void *arg){
-	if (p2pproxy_application_start(0,NULL)!=0){
+	char *argv[]={"-edge-only","-sip", "5058",NULL};
+	if (p2pproxy_application_start(3,argv)!=0){
 		ms_error("Fail to start fonis thread !");
 	}
 	return NULL;