diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index 4973f9e038..9f870a953a 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -413,14 +413,14 @@ grid (GimpImage    *image,
       GimpDrawable *drawable,
       GimpPreview  *preview)
 {
-  GeglBuffer *src_buffer;
-  GeglBuffer *dest_buffer;
+  GeglBuffer *src_buffer  = NULL;
+  GeglBuffer *dest_buffer = NULL;
   const Babl *format;
   gint        bytes;
   gint        x_offset;
   gint        y_offset;
-  guchar     *dest;
-  guchar     *buffer = NULL;
+  guchar     *dest        = NULL;
+  guchar     *buffer      = NULL;
   gint        x, y;
   gboolean    alpha;
   gboolean    blend;