Do not duplicate handlers on reload
Fix handling of duplicate handlers