Water: Fix a rare NPE