Merge "Prevent NullPointerException in config-util"