Added more error trapping as well as fixing some logic and refactoring some large if statements to be more descriptive.
Merge branch 'master' of https://github.com/grofit/playmaker-astar-actions