diff --git a/server/eit/main.py b/server/eit/main.py
index 5a7fc2966..b51de1eec 100644
--- a/server/eit/main.py
+++ b/server/eit/main.py
@@ -50,7 +50,7 @@ def main():
     for descriptor in descriptors:
         klass = descriptor.get_class()
         if klass.CATCH_ALL:
-            catch_all = descriptor
+            catch_all = klass
         args_map[klass.NAME] = klass
         for alias in klass.ALIASES:
             args_map[alias] = klass