Extra null checks +

good things for @jk-5 's eyes ^-^