Update README and error handling