Fixes issue #3 - NPE on faulty configuration