Added infinite loop and error check
Merge branch 'master' of github.com:mrobinson7627/fuck-spammers