fixed exception handling
Merge branch 'master' of https://github.com/bedekelly/AQA-Coursework