Added some better error detection, the Tap object is no longer required for operations, although minimum flow detection will not work without it