Fix null reference case