Add some error checks, update Readme