diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index 38cae5794ce..e11921fec06 100644
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -108,14 +108,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
         print('    (offset >= 0) ? (((_glapi_proc *)(disp))[offset]) : NULL')
         print('#define SET_by_offset(disp, offset, fn) \\')
         print('    do { \\')
-        print('        if ( (offset) < 0 ) { \\')
-        print('            /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\\n", */ \\')
-        print('            /*         __func__, __LINE__, disp, offset, # fn); */ \\')
-        print('            /* abort(); */ \\')
-        print('        } \\')
-        print('        else { \\')
-        print('            ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \\')
-        print('        } \\')
+        print('        assert(offset >= 0 && offset < _gloffset_COUNT); \\')
+        print('        ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \\')
         print('    } while(0)')
         print('')