Fix exception consistancy

fix for issue #81