Thread might actually be detached, so need to handle that

Thread might actually be detached, so need to handle that #1264