diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 081b363ab..c2627b9ce 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -287,7 +287,8 @@ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
 			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 				   "Couldn't flink pixmap handle\n");
 			glamor_set_pixmap_type(pixmap, GLAMOR_DRM_ONLY);
-			exit(1);
+			assert(0);
+			return FALSE;
 		}
 	} else
 		name = handle;
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 2aa03d005..91473c32d 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -32,7 +32,9 @@
 #endif
 
 #include <xorg-server.h>
-
+#ifndef DEBUG
+#define NDEBUG
+#endif
 #include "glamor.h"
 
 #define GL_GLEXT_PROTOTYPES
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index de01aab33..3f3a3bc18 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -427,7 +427,7 @@ glamor_init_composite_shaders(ScreenPtr screen)
 	}
 
 	if (eb == NULL)
-		FatalError("fatal error, fail to get eb.\n");
+		FatalError("fatal error, fail to get element buffer. GL context may be not created correctly.\n");
 	glamor_init_eb(eb, GLAMOR_COMPOSITE_VBO_VERT_CNT);
 
 	if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {