Tidying up some of the error handling
Merge branch 'master' of https://github.com/jerumble/vVoteVerifier.git