Fixed more of the null bug