Fix null 1 errors