better error handling on remove network