Move exception support to constructor