diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 1dfaf3c3c..2c37903b4 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1932,13 +1932,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv*
 																		,jlong lc
 																		,jobject obj) {
 	jobject oldWindow = (jobject) linphone_core_get_native_video_window_id((LinphoneCore*)lc);
-	if (oldWindow != NULL) {
-		env->DeleteGlobalRef(oldWindow);
-	}
 	if (obj != NULL) {
 		obj = env->NewGlobalRef(obj);
 	}
 	linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
+	if (oldWindow != NULL) {
+		env->DeleteGlobalRef(oldWindow);
+	}
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEnv* env
@@ -1946,13 +1946,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEn
 																		,jlong lc
 																		,jobject obj) {
 	jobject oldWindow = (jobject) linphone_core_get_native_preview_window_id((LinphoneCore*)lc);
-	if (oldWindow != NULL) {
-		env->DeleteGlobalRef(oldWindow);
-	}
 	if (obj != NULL) {
 		obj = env->NewGlobalRef(obj);
 	}
 	linphone_core_set_native_preview_window_id((LinphoneCore*)lc,(unsigned long)obj);
+	if (oldWindow != NULL) {
+		env->DeleteGlobalRef(oldWindow);
+	}
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv* env
diff --git a/mediastreamer2 b/mediastreamer2
index 0c0a3a36d..cab341d59 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0c0a3a36d2352d53053ab8b9255b48b6b05843ae
+Subproject commit cab341d59bc4d37f82ddccbfcf1ae2563f9c5028