Updated so it won't error when it can't fire an event