Fix possible NPE in AddListenerAction