diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9c0676287b..9de4db6c3c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2540,10 +2540,8 @@ gtk_tree_view_get_preferred_width (GtkWidget *widget,
 	tree_view->priv->n_expand_columns++;
     }
 
-  if (minimum != NULL)
-    *minimum = tree_view->priv->minimum_width;
-  if (natural != NULL)
-    *natural = tree_view->priv->natural_width;
+  *minimum = tree_view->priv->minimum_width;
+  *natural = tree_view->priv->natural_width;
 }
 
 static void
@@ -2558,10 +2556,8 @@ gtk_tree_view_get_preferred_height (GtkWidget *widget,
 
   height = gtk_tree_view_get_height (tree_view) + gtk_tree_view_get_effective_header_height (tree_view);
 
-  if (minimum != NULL)
-    *minimum = height;
-  if (natural != NULL)
-    *natural = height;
+  *minimum = height;
+  *natural = height;
 }
 
 static void