Reposition error checking code
Merge branch 'master' of https://github.com/Rob4001/supybot-geeksoc

Conflicts:
	plugin.py