Merge "getConfiguration: Don't bail when a valid variable is set null"