Merge "Stop neutron resource leaking even if an error occurs"