diff --git a/src/kits/opengl/GLRendererRoster.cpp b/src/kits/opengl/GLRendererRoster.cpp
index 48ecfa3877..e37449af92 100644
--- a/src/kits/opengl/GLRendererRoster.cpp
+++ b/src/kits/opengl/GLRendererRoster.cpp
@@ -36,7 +36,11 @@ GLRendererRoster::~GLRendererRoster()
 BGLRenderer *
 GLRendererRoster::GetRenderer(int32 id)
 {
-	struct renderer_item item = fRenderers[id];
+	RendererMap::const_iterator iterator = fRenderers.find(id);
+	if (iterator == fRenderers.end())
+		return NULL;
+
+	struct renderer_item item = iterator->second;
 	return item.renderer;
 }
 
diff --git a/src/kits/opengl/mesa/Jamfile b/src/kits/opengl/mesa/Jamfile
index 5eac12da45..8f67a32749 100644
--- a/src/kits/opengl/mesa/Jamfile
+++ b/src/kits/opengl/mesa/Jamfile
@@ -7,6 +7,9 @@ if $(TARGET_PLATFORM) != haiku {
 		# We need our not platform one, public GL headers also when not compiling for Haiku.
 }
 
+# Don't compile libmesa.a with debugging.
+DEBUG = 0 ;
+
 UsePrivateHeaders opengl ;
 
 UseHeaders [ FDirName $(SUBDIR) main ] ;