Additional Water Error Checking