Updated implementation for exceptions-0.6

This should fix #50