handle errors from initial remove correctly