diff --git a/src/backends/x11/meta-output-xrandr.c b/src/backends/x11/meta-output-xrandr.c
index 11f693a04..bb6588de3 100644
--- a/src/backends/x11/meta-output-xrandr.c
+++ b/src/backends/x11/meta-output-xrandr.c
@@ -461,9 +461,15 @@ output_get_max_bpc_range_xrandr (Display      *xdisplay,
                                           atom);
   meta_clutter_x11_untrap_x_errors ();
 
-  if (!property_info || property_info->num_values != 2)
+  if (!property_info)
     return FALSE;
 
+  if (property_info->num_values != 2)
+    {
+      XFree (property_info);
+      return FALSE;
+    }
+
   values = (long *) property_info->values;
   if (min)
     *min = values[0];