Better error detection and updated Readme