Added HPE guard clause to Expansion.contains()