Fix error handling issue, closes #14