[0.0.6m] Added Some minor protection around routines - Thanks Evangeline
Merge branch 'master' of http://github.com/billy1arm/spurious243