Fix NullPointerException with old configs
Merge pull request #41 from vgrichina/patch-1

Fix NullPointerException with old configs