Add null check and block-nilling