Fix bug with exception detection in water sources