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