Runtime error in entity_registry.py when adding new Z-wave device

I was adding a new Z-Wave Popp Smoke Detector to Home Assistant (0.72.1). This is the fourth one, the first three were added without issues. Something went wrong with this one though. I expected five sensors to be added, but only got four.

Error in manager callback
Traceback (most recent call last):
  File "/srv/homeassistant/lib/python3.5/site-packages/openzwave/network.py", line 950, in zwcallback
    self._handle_value_added(args)
  File "/srv/homeassistant/lib/python3.5/site-packages/openzwave/network.py", line 1480, in _handle_value_added
    'value' : self.nodes[args['nodeId']].values[args['valueId']['id']]})
  File "/srv/homeassistant/lib/python3.5/site-packages/pydispatch/dispatcher.py", line 338, in send
    **named
  File "/srv/homeassistant/lib/python3.5/site-packages/pydispatch/robustapply.py", line 55, in robustApply
    return receiver(*arguments, **named)
  File "/srv/homeassistant/lib/python3.5/site-packages/homeassistant/components/zwave/__init__.py", line 290, in value_added
    hass, schema, value, config, device_config, registry)
  File "/srv/homeassistant/lib/python3.5/site-packages/homeassistant/components/zwave/__init__.py", line 742, in __init__
    self._check_entity_ready()
  File "/srv/homeassistant/lib/python3.5/site-packages/homeassistant/components/zwave/__init__.py", line 802, in _check_entity_ready
    compute_value_unique_id(self._node, self.primary))
  File "/srv/homeassistant/lib/python3.5/site-packages/homeassistant/helpers/entity_registry.py", line 90, in async_get_entity_id
    for entity in self.entities.values():
RuntimeError: OrderedDict mutated during iteration

Attempting to remove the node (in order to try adding again) also fails with 12 of the following warnings:

Notification ValueRemoved for an unknown value ({'id': 72057594253721617}) on node 12
7:45 PM /srv/homeassistant/lib/python3.5/site-packages/openzwave/network.py (WARNING)