[WIP] - NPEs cleanup

Just a cleanup of potential NPEs in the core
Hmm.... Just a mistake, of course