Hopefully fix NPE

Started as a CP from Carbon --> Fail
So let's try a different way of defining null

Change-Id: I346ae4af4983e9e8dbe9533eeddef445affc339a
Signed-off-by: DHOMD <DHO@dho.im>