Null check

Crazy that we got this far without it