fixed exception
Merge branch 'master' of https://xantoh@github.com/cs2103aug2014-t17-4j/main.git