Instances in and ERROR state will not delete

This appears to happen when an instance does not have an IP assigned. That condition created the initial ERROR state for the instance. Here is a trace from the failed DELETE operation:

(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 643, in terminate_instance
(nova.rpc): TRACE: self._delete_instance(context, instance)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 620, in _delete_instance
(nova.rpc): TRACE: self._shutdown_instance(context, instance, 'Terminating', True)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 584, in _shutdown_instance
(nova.rpc): TRACE: network_info = self._get_instance_nw_info(context, instance)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 273, in _get_instance_nw_info
(nova.rpc): TRACE: instance)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/network/api.py", line 163, in get_instance_nw_info
(nova.rpc): TRACE: 'args': args})
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/rpc/__init__.py", line 61, in call
(nova.rpc): TRACE: return _get_impl().call(context, topic, msg)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/rpc/impl_kombu.py", line 809, in call
(nova.rpc): TRACE: rv = list(rv)
(nova.rpc): TRACE: File "/usr/lib/pymodules/python2.6/nova/rpc/impl_kombu.py", line 777, in __iter__
(nova.rpc): TRACE: raise result
(nova.rpc): TRACE: RemoteError: Remote error: NetworkNotFound Network None could not be found.

This is occurring on the current Essex trunk code.