Updated error handling
Updated readme