diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index 78fb6f0f2..64e7a3592 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -891,12 +891,17 @@ static bool ConvertDXILConstantToShaderVariable(const Constant *constant, Shader
           RDCERR("Constant GetElementPtr first member is not a GlobalVar");
           return false;
         }
-        const DXIL::Type *elementType = gv->type;
-        if(elementType->type != Type::TypeKind::Pointer)
+        if(gv->type->type != Type::TypeKind::Pointer)
         {
           RDCERR("Constant GetElementPtr global variable is not a Pointer");
           return false;
         }
+        const DXIL::Type *elementType = constant->type;
+        if(elementType->type != Type::TypeKind::Pointer)
+        {
+          RDCERR("Constant variable is not a Pointer");
+          return false;
+        }
         elementType = elementType->inner;
         VarType baseType = ConvertDXILTypeToVarType(elementType);
         uint32_t elementSize = GetElementByteSize(baseType);