Use of default value for for properties using the Key Expansion mechanism

We have to get default values even for properties using the Key Expansion mechanism.
I see 2 alternatives:
1. We have to try get the value for unexpanded key when the expanded key is not defined in source.
2. Fill the properties manager with default values for all expanded keys, then add values found in source.

I had chosen the first solution.