diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 917faca7e..2bf146d97 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -240,7 +240,8 @@ static void process_request_event(void *ud, const belle_sip_request_event_t *eve
 			/*special case for Dialog created by notify mathing subscribe*/
 			belle_sip_transaction_t * sub_trans = belle_sip_dialog_get_last_transaction(dialog);
 			op = (SalOp*)belle_sip_transaction_get_application_data(sub_trans);
-		} else if (op==NULL || op->state==SalOpStateTerminated){
+		}
+		if (op==NULL || op->state==SalOpStateTerminated){
 			ms_warning("Receiving request for null or terminated op [%p], ignored",op);
 			return;
 		}
diff --git a/mediastreamer2 b/mediastreamer2
index 0c53b29f5..b46d2cf1c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0c53b29f5d5efac175267e3e983b0b55ba5f1dfa
+Subproject commit b46d2cf1cb9247a7bd2d57ba312d668981b4eed7
diff --git a/tester/accountmanager.c b/tester/accountmanager.c
index d4c0cb5cd..52973682c 100644
--- a/tester/accountmanager.c
+++ b/tester/accountmanager.c
@@ -160,8 +160,8 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
 	linphone_proxy_config_set_expires(cfg,3*3600); //accounts are valid 3 hours
 
 	linphone_core_add_proxy_config(lc,cfg);
-
-	if (wait_for_until(lc,NULL,&account->created,1,10000)==FALSE){
+	/*wait 15 seconds, since the DNS SRV resolution make time a while*/
+	if (wait_for_until(lc,NULL,&account->created,1,15000)==FALSE){
 		ms_fatal("Account for %s could not be created on server.", linphone_proxy_config_get_identity(refcfg));
 	}
 	linphone_proxy_config_edit(cfg);