Added exception support.