Adding error checking
Merge branch 'master' of github.com:Voltzz/massive-octo-ironman