Be more permissive with nulls