Fixed copy and paste after last change
Fixed a few null checks for config files