Modified error messages; fixes #12