Updated implementation for exceptions-0.6