Fixed error handling
Upped version