DF Fixed NPE in deliveries.