diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java
index 319c198d0..6c52a2bee 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java
@@ -114,14 +114,16 @@ public class NamespaceSet {
         for (int n:namespaces) {
             Namespace ns = constants.getNamespace(n);
             String nsName = ns.getRawName(constants);
+            namespaceKinds.add(ns.kind);
             if (nsName != null && nsName.length() > 0) {
                 int lastChar = nsName.codePointAt(nsName.length() - 1);
                 if (lastChar >= Namespace.MIN_API_MARK && lastChar <= Namespace.MAX_API_MARK) {
-                    namespaceNames.add(nsName.substring(0, nsName.length() - 1));
-                    namespaceKinds.add(ns.kind);
+                    namespaceNames.add(nsName.substring(0, nsName.length() - 1));                    
                 } else {
-                    return 0;
+                    namespaceNames.add(nsName);
                 }
+            } else {
+                namespaceNames.add(nsName);
             }
         }
         if (namespaceNames.size() != 1) {
@@ -142,8 +144,10 @@ public class NamespaceSet {
                 if (lastChar >= Namespace.MIN_API_MARK && lastChar <= Namespace.MAX_API_MARK) {
                     namespaceNames.add(nsName.substring(0, nsName.length() - 1));
                 } else {
-                    return null;
+                    namespaceNames.add(nsName);
                 }
+            } else {
+                namespaceNames.add(nsName);
             }
         }
         if (namespaceNames.size() != 1) {