o.c.dal2: Fixed NPE caused by racing conditions