See if we can stop the event throwing an NPE.