I'll come back to fix the whacky null check placement post-merge.