Fix NPE in delayed ZAP.