1 files changed, 6 insertions, 4 deletions
diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp
index 93e495194..d7f793d05 100644
--- a/source/slang/slang-reflection-api.cpp
+++ b/source/slang/slang-reflection-api.cpp
@@ -23,11 +23,11 @@ namespace Slang
 
 // Conversion routines to help with strongly-typed reflection API
 
-static inline UserDefinedAttribute* convert(SlangReflectionUserAttribute* attrib)
+static inline Attribute* convert(SlangReflectionUserAttribute* attrib)
 {
-    return (UserDefinedAttribute*)attrib;
+    return (Attribute*)attrib;
 }
-static inline SlangReflectionUserAttribute* convert(UserDefinedAttribute* attrib)
+static inline SlangReflectionUserAttribute* convert(Attribute* attrib)
 {
     return (SlangReflectionUserAttribute*)attrib;
 }
@@ -154,7 +154,9 @@ static SlangReflectionUserAttribute* findUserAttributeByName(
     const char* name)
 {
     auto nameObj = session->tryGetNameObj(name);
-    for (auto x : decl->getModifiersOfType<UserDefinedAttribute>())
+    if (!nameObj)
+        return nullptr;
+    for (auto x : decl->getModifiersOfType<Attribute>())
     {
         if (x->keywordName == nameObj)
             return (SlangReflectionUserAttribute*)(x);