Fix NPE with Infinite water source