[FIX] Better error reporting
[ADD] Closes #34