diff --git a/gtk/utils.c b/gtk/utils.c
index b8db633d8..c03ea462b 100644
--- a/gtk/utils.c
+++ b/gtk/utils.c
@@ -102,14 +102,14 @@ void linphone_gtk_reload_sound_devices(void){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *pb=(GtkWidget*)g_object_get_data(G_OBJECT(mw),"parameters");
 	linphone_core_reload_sound_devices(linphone_gtk_get_core());
-	linphone_gtk_fill_soundcards(pb);
+	if (pb) linphone_gtk_fill_soundcards(pb);
 }
 
 void linphone_gtk_reload_video_devices(void){
 	GtkWidget *mw=linphone_gtk_get_main_window();
 	GtkWidget *pb=(GtkWidget*)g_object_get_data(G_OBJECT(mw),"parameters");
 	linphone_core_reload_video_devices(linphone_gtk_get_core());
-	linphone_gtk_fill_webcams(pb);
+	if (pb) linphone_gtk_fill_webcams(pb);
 }
 
 #ifdef HAVE_LIBUDEV_H
diff --git a/mediastreamer2 b/mediastreamer2
index 05fba59cf..82b3f80d3 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 05fba59cf8aa11914ad6130955c1a6d60d67eda5
+Subproject commit 82b3f80d3171c1fbcda07d5199b3a74849ad9105