Added exception support into direct bundle