added error code
Merge branch 'master' of https://github.com/tianyuzhang/cs454a3