Fix guard against events not existing