Updated readme and added more error handling