Yeah, I didn't have the null check at first but a few of the tests threw NPE