Add handling of missing key names #566