Fix other potential NPEs with water source