Better error messages
Merge branch 'master' of https://github.com/lchsiao/LibraryProject304