Hardening of the Daemon discovery code