calling YAGNI on Except

This reverts commit a581214fbc3242ccd243db8692ff7f4fcf316c01.