Fixed a config-issue and a replacement for "nonetype"  thing.