Fix: fixes #11 and cleaner exception reporting