better error handling on node de-registration