Adding better errors, partially fixes #12