Reverting commit e864e75cc190325aca7de38eef38107e56efcbec.

Fixes #168. I hope to someday return and remove those blasted Exceptions, though.