DF#QCADOOMESCLS-800 Fixed NPE in partial deliveries.