Add check for default keys.

Missing check for keys that might not be set but are part of the default
paramters.