Better handling of nulls.