made poller and relay more robust