Fix null responses