Move null check in Washer logic
Merge pull request #63 from Quetzi/master

Move null check in Washer logic