Bug fix regarding nils and configs