Modify error handling a bit
Updat readme