Update default configuration to prevent NPE