Small exception fixes and updated the readme.