[#97] Accept null values