exception handling fixes
Merge branch 'master' of https://github.com/andrewsarnold/FlagMaker