added exception
Merge branch 'master' of https://github.com/Komodoman/OOAD
all tests pass BIOTCH