[WIP] - NPEs cleanup

Just a cleanup of potential NPEs in the core
Not a mistake but javax.annotations. is preferable imho