diff --git a/package/gluon-announced/files/usr/lib/lua/gluon/announced.lua b/package/gluon-announced/files/usr/lib/lua/gluon/announced.lua
index a9de80e6..4718f571 100644
--- a/package/gluon-announced/files/usr/lib/lua/gluon/announced.lua
+++ b/package/gluon-announced/files/usr/lib/lua/gluon/announced.lua
@@ -11,10 +11,6 @@ end
 module('gluon.announced', package.seeall)
 
 function handle_request(query)
-  if query:match('^nodeinfo$') then
-    return json.stringify(collect('nodeinfo'))
-  end
-
   local m = query:match('^GET ([a-z ]+)$')
   if m then
     local data = {}
@@ -29,5 +25,10 @@ function handle_request(query)
     if next(data) then
       return deflate.compress(json.stringify(data))
     end
+  elseif query:match('^[a-z]+$') then
+    local ok, data = pcall(collect, query)
+    if ok then
+      return json.stringify(data)
+    end
   end
 end