Fix/directexceptions

Fixes #26