Fix the OnDestroy NRE and #450