Added handling of attribute value nulls