Fix null bug once and for all