Simplify error handling to more informative and reliable (double win)
Version 0.1.7-alpha