DF Some fixes with company.
DF Fixed NPE in deliveries.