Fixing the null bug