diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 1c62ac6f2e4..7927a4e1f6f 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -594,7 +594,7 @@
       <param name="index" type="GLuint" />
    </function>
 
-   <function name="VertexArrayElementBuffer">
+   <function name="VertexArrayElementBuffer" no_error="true">
       <param name="vaobj" type="GLuint" />
       <param name="buffer" type="GLuint" />
    </function>
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 89fa473ff87..600177cc5c9 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -686,6 +686,14 @@ vertex_array_element_buffer(struct gl_context *ctx, GLuint vaobj, GLuint buffer,
 }
 
 
+void GLAPIENTRY
+_mesa_VertexArrayElementBuffer_no_error(GLuint vaobj, GLuint buffer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   vertex_array_element_buffer(ctx, vaobj, buffer, true);
+}
+
+
 void GLAPIENTRY
 _mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer)
 {
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 691475fb2fd..1b9900c6e55 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -116,6 +116,9 @@ void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
 
 GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
 
+void GLAPIENTRY
+_mesa_VertexArrayElementBuffer_no_error(GLuint vaobj, GLuint buffer);
+
 void GLAPIENTRY _mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer);
 
 void GLAPIENTRY _mesa_GetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param);