Updated Config
Corrected NPE