diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py
index 60499db..8411bd4 100644
--- a/lib/tfw/networking/server/tfw_server.py
+++ b/lib/tfw/networking/server/tfw_server.py
@@ -24,11 +24,13 @@ class TFWServer:
         return self._fsm
 
     def make_response(self, message):
+        trigger = message.get('trigger', '')
+        try: self.fsm.trigger(trigger, message=message)
+        except AttributeError: log.debug('FSM failed to execute nonexistent trigger: "{}"'.format(trigger))
         return message
 
     def proxy_filter(self, message):
-        try: return self.fsm.trigger(message['key'], message=message)
-        except AttributeError: return False
+        return True
 
     def listen(self, port):
         self.application.listen(port)