Fix crash with null value in manual entry