Catching errors
Merge branch 'master' of https://github.com/MorningCoffee/powerteam