[BUGFIX] gracefully handle removed nodes