diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 310da02ff4..8f495a795d 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -705,10 +705,13 @@ gtk_style_update_from_context (GtkStyle *style)
                          "padding", &padding,
                          NULL);
 
-  style->xthickness = padding->left;
-  style->ythickness = padding->top;
+  if (padding)
+    {
+      style->xthickness = padding->left;
+      style->ythickness = padding->top;
 
-  gtk_border_free (padding);
+      gtk_border_free (padding);
+    }
 }
 
 static void