Fix null in constant calculator