Deal with nulls (fix #1925).