diff --git a/chapi-ast-c/src/main/kotlin/chapi/ast/cast/CFullIdentListener.kt b/chapi-ast-c/src/main/kotlin/chapi/ast/cast/CFullIdentListener.kt
index c2b4f349..b1c9409c 100644
--- a/chapi-ast-c/src/main/kotlin/chapi/ast/cast/CFullIdentListener.kt
+++ b/chapi-ast-c/src/main/kotlin/chapi/ast/cast/CFullIdentListener.kt
@@ -41,10 +41,10 @@ open class CFullIdentListener(fileName: String) : CAstBaseListener() {
         structOrUnionSpecifier?.let {
             var nodeName = maybeNodeName ?: structOrUnionSpecifier.Identifier()?.text
             if (nodeName.isNullOrEmpty()) {
-                nodeName = structOrUnionSpecifier?.structOrUnion()?.text ?: ""
+                nodeName = structOrUnionSpecifier.structOrUnion()?.text ?: ""
             }
 
-            handleStructOrUnion(structOrUnionSpecifier, nodeName ?: "")
+            handleStructOrUnion(structOrUnionSpecifier, nodeName)
         }
     }