Addressed a possible crash on re-init