Added zero-output handler