6 files changed, 18 insertions, 6 deletions
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index 74e728ad4c..9a92b5c9a2 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -562,7 +562,9 @@ get_widgets (AlarmPage *apage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("alarm-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);
 	
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 93d9b65e14..5646a31a76 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -534,7 +534,9 @@ get_widgets (EventPage *epage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("event-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);
 
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 7932fbd177..fddaab1900 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -373,7 +373,9 @@ get_widgets (MeetingPage *mpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("meeting-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);
 
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index c5c45def15..e1656ad83f 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -1747,7 +1747,9 @@ get_widgets (RecurrencePage *rpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("recurrence-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);
 
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 76a3cadcd4..2e4a5ddab1 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -320,7 +320,9 @@ get_widgets (TaskDetailsPage *tdpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("task-details-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 02a1e1bfd3..ce01a389e6 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -618,7 +618,9 @@ get_widgets (TaskPage *tpage)
 #define GW(name) glade_xml_get_widget (priv->xml, name)
 
 	priv->main = GW ("task-page");
-	g_assert (priv->main);
+	if (!priv->main)
+		return FALSE;
+
 	gtk_widget_ref (priv->main);
 	gtk_widget_unparent (priv->main);