Simona's Requiem: Minor fix 4

* fix False Custodian soft lock * fix pre Time lord exit issue