Tidying up exceptions
Merge branch 'master' of https://github.com/SeanSmithers/top-n