Fix null column exception