diff --git a/projects/nat-archive-tool/src/nat/Lib.kiss b/projects/nat-archive-tool/src/nat/Lib.kiss
index bd784f33..2bcd3a84 100644
--- a/projects/nat-archive-tool/src/nat/Lib.kiss
+++ b/projects/nat-archive-tool/src/nat/Lib.kiss
@@ -56,9 +56,11 @@
                 (= ,value (readComponent e ,componentType))))
         ,process))
 
-(function tagList [archive e]
-    (let [t (readComponent e Tags)]
-        (collect (t.keys))))
+(function :Array<String> tagList [archive :nat.Entry e]
+    (if (hasComponent e Tags)
+            (let [t (readComponent e Tags)]
+                (collect (t.keys)))
+        []))
 
 (function tagsMatch [archive e tagsBoolExp]
     (BoolExpInterp.eval tagsBoolExp (tagList archive e)))