Exceptions

Squishy squashy bugs

Fixes #38