Fix issue when nil passed to AttributeValue