Better error handling
Bump versions