Crashes after CW update in both modes

Thank you @BerkenStrips, really appreciate the update! I’ll keep this in mind for similar cases!