Avoid NPE when using config-list command
2 files changed