Add automatic consumer termination handler