diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 6182f810..30e00853 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -742,6 +742,11 @@ void TParseVersions::updateExtensionBehavior(int line, const char* extension, co
         return;
     }
 
+#ifdef NV_EXTENSIONS
+    if (!checkShaderStageForNVExtensions(getCurrentLoc(), extension))
+        return;
+#endif
+
     // update the requested extension
     updateExtensionBehavior(extension, behavior);
 
diff --git a/glslang/MachineIndependent/preprocessor/Pp.cpp b/glslang/MachineIndependent/preprocessor/Pp.cpp
index 7f39c34a..12353550 100644
--- a/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -874,11 +874,6 @@ int TPpContext::CPPextension(TPpToken* ppToken)
         return token;
     }
 
-#ifdef NV_EXTENSIONS
-    if (!parseContext.checkShaderStageForNVExtensions(ppToken->loc, extensionName))
-        return token;
-#endif
-
     parseContext.updateExtensionBehavior(line, extensionName, ppToken->name);
     parseContext.notifyExtensionDirective(line, extensionName, ppToken->name);