ACTUALLY fixed the null pointer exception in ternary expressions that I thought I fixed with the last commit.