Exceptions

Fixes for issues #61 #63