Changed error handling
Bumped version