diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox
index 364420ba3..51882e1e0 100644
--- a/doc/opengl-support.dox
+++ b/doc/opengl-support.dox
@@ -248,6 +248,7 @@ Extension                                   | Status
 @extension{ARB,transform_feedback_overflow_query} | |
 @extension{KHR,blend_equation_advanced}     | done
 @extension3{KHR,blend_equation_advanced_coherent,blend_equation_advanced} | done
+@extension{KHR,no_error}                    | |
 
 @subsection opengl-support-extensions-vendor Vendor OpenGL extensions
 
@@ -380,6 +381,7 @@ Extension                                   | Status
 @es_extension{KHR,robustness}               | |
 @es_extension{KHR,robust_buffer_access_behavior} | done (nothing to do)
 @es_extension{KHR,context_flush_control}    | |
+@es_extension2{KHR,no_error,no_error}       | |
 @es_extension2{NV,read_buffer_front,NV_read_buffer} | done
 @es_extension2{NV,read_depth,NV_read_depth_stencil} | done
 @es_extension2{NV,read_stencil,NV_read_depth_stencil} | done
diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp
index e0973b764..d1ccf9235 100644
--- a/src/Magnum/Context.cpp
+++ b/src/Magnum/Context.cpp
@@ -93,7 +93,8 @@ const std::vector<Extension>& Extension::extensions(Version version) {
         _extension(GL,KHR,texture_compression_astc_ldr),
         _extension(GL,KHR,texture_compression_astc_hdr),
         _extension(GL,KHR,blend_equation_advanced),
-        _extension(GL,KHR,blend_equation_advanced_coherent)};
+        _extension(GL,KHR,blend_equation_advanced_coherent),
+        _extension(GL,KHR,no_error)};
     static const std::vector<Extension> extensions300{
         _extension(GL,ARB,map_buffer_range),
         _extension(GL,ARB,color_buffer_float),
@@ -291,6 +292,7 @@ const std::vector<Extension>& Extension::extensions(Version version) {
         _extension(GL,KHR,robustness),
         _extension(GL,KHR,robust_buffer_access_behavior),
         _extension(GL,KHR,context_flush_control),
+        _extension(GL,KHR,no_error),
         _extension(GL,NV,read_buffer_front),
         _extension(GL,NV,read_depth),
         _extension(GL,NV,read_stencil),
diff --git a/src/Magnum/Extensions.h b/src/Magnum/Extensions.h
index 478bff6e9..a36c4f5d4 100644
--- a/src/Magnum/Extensions.h
+++ b/src/Magnum/Extensions.h
@@ -232,6 +232,7 @@ namespace GL {
         _extension(GL,KHR,robustness,                   GL320, GL450) // #170
         _extension(GL,KHR,blend_equation_advanced,      GL210,  None) // #174
         _extension(GL,KHR,blend_equation_advanced_coherent, GL210, None) // #174
+        _extension(GL,KHR,no_error,                     GL210,  None) // #175
     } namespace NV {
         _extension(GL,NV,primitive_restart,             GL210, GL310) // #285
         _extension(GL,NV,depth_buffer_float,            GL210, GL300) // #334
@@ -371,6 +372,7 @@ namespace GL {
         _extension(GL,KHR,robustness,               GLES200,    None) // #170
         _extension(GL,KHR,robust_buffer_access_behavior, GLES200, None) // #189
         _extension(GL,KHR,context_flush_control,    GLES200,    None) // #191
+        _extension(GL,KHR,no_error,                 GLES200,    None) // #243
     } namespace NV {
         #ifdef MAGNUM_TARGET_GLES2
         _extension(GL,NV,draw_buffers,              GLES200, GLES300) // #91