EHO-480 NPE when firstname is null