more error checking
Merge branch 'master' of https://github.com/WeHeartGaming/Codename-WHIRC