Cleaned up and fixed ProtectionEventHandler. Updates #1101