more exception handling
Merge branch 'master' of https://github.com/nmbook/csc296s14-dbsys-tams