Fix a couple more NPEs

(fix to BlockBox from rmuhic)