Corret NPE with config debug check
Commenting :cat:
...
Formatting and tweaks?