Add back support for exceptions 0.5