Issues/11

Addresses issue #11, sort of.

Adding better, more verbose error handling.