Return nil for missing address fields instead of raising