2 Years Ago
Added more checks to try and kerb this NRE