added some more checks to avoid breaking because of unexpected data
Merge branch 'ttm' of github.com:jkoenig311/carolshubot