Move null check in Washer logic