For ENG-5962, be more defensive about cleaning up verboten thread entry