Fixed empty field detection + thread closing when it happens