More nil checks

They're annoying but I think that's all of them