Fix null case