diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 15f8fb31faf..473ed4d9134 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -77,6 +77,10 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *r
    else
       format = st_choose_renderbuffer_format(screen, internalFormat, rb->NumSamples);
       
+   if (format == PIPE_FORMAT_NONE) {
+      return FALSE;
+   }
+
    /* init renderbuffer fields */
    strb->Base.Width  = width;
    strb->Base.Height = height;