kohabug 2224 Third installment: Further corrections for NULL fields