Dialysis machines and methods for operating dialysis machines (e.g.,peritoneal dialysis machines) may include deliveringdialysate and detecting a temperature of a volume of the dialysate, an aircontent of the dialysate volume, or another condition, orcombinations thereof, wherein the detected temperature of the dialysate volumeis compared to a predetermined maximum temperature,the detected air content of the dialysate volume is compared to apredetermined maximum air content and the detected other conditiongenerates a signal. The volume of dialysate may be diverted in response to thedetected temperature exceeding the predeterminedmaximum temperature, the air content exceeding the predetermined maximum aircontent, or the other condition generated signal, orcombinations thereof.