[0.0.6m] Added Some minor protection around routines - Thanks Evangelina