Added basic error handling
Upped version