Add exception support