Better error checking
Update README.md