4/25 fixed nullptrexcep