Adding checks to try to avoid poison pills due to rm'ed files.