diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index 307788746..e35f40ef1 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -1704,7 +1704,10 @@ on_motion_notify (GtkWidget *widget,
         update_row_shadowing (dialog->preselected_row2, FALSE);
     }
 
-    g_return_val_if_fail (gdk_event_get_coords (event, NULL, &y), GDK_EVENT_PROPAGATE);
+    if (G_UNLIKELY (!gdk_event_get_coords (event, NULL, &y)))
+    {
+        g_return_val_if_reached (GDK_EVENT_PROPAGATE);
+    }
 
     if (widget == dialog->result_listbox)
     {
diff --git a/src/nautilus-list-view-dnd.c b/src/nautilus-list-view-dnd.c
index a1b64aa54..96dc4bc4f 100644
--- a/src/nautilus-list-view-dnd.c
+++ b/src/nautilus-list-view-dnd.c
@@ -285,7 +285,10 @@ nautilus_list_view_dnd_drag_begin (NautilusListView *list_view,
         source_target_list = nautilus_list_model_get_drag_target_list ();
     }
 
-    g_return_val_if_fail (gdk_event_get_coords (event, &x, &y), GDK_EVENT_PROPAGATE);
+    if (G_UNLIKELY (!gdk_event_get_coords (event, &x, &y)))
+    {
+        g_return_val_if_reached (GDK_EVENT_PROPAGATE);
+    }
 
     if (gtk_drag_check_threshold (GTK_WIDGET (list_view->details->tree_view),
                                   list_view->details->drag_x,