prevented server from crashing on boot by large number of extra checks
Merge branch 'master' of https://github.com/ZimonD/ContextCG7