@DLane Thanks for the creative problem solving 
Fortunately we are getting close to making this a feature that should be testable next week. It will provide a check post schedule run to look for any water.
This feature will live at the controller level and you can enable or disable based on your use case.