Null reference exception when no ObjectDesign with TypeDefinition "NamespaceMetadataType"|OPC UA Implementation: Stacks, Tools, and Samples|Forum|OPC Foundation

After grabbing the latest ModelCompiler source code, my model file is fails.

The new method SetStaticNodeIdRanges has the following code in a loop over the dictionary items:

if (metadata == null)
{
    metadata = node as ObjectDesign;

    if (metadata != null && metadata.TypeDefinition != new XmlQualifiedName("NamespaceMetadataType", Namespaces.OpcUa))
    {
        metadata = null;
    }
}

Since my model doesn't have any ObjectDesign objects with the TypeDefinition named "NamespaceMetadataType", metadata is set back to null, and a null reference exception is thrown on line 985:

if (metadata.Hierarchy.NodeList != null)

My model does have an ObjectDesign, but its TypeDefinition is named "BaseObjectType".

Is this a regression, or would the model be invalid in that case? Either way, it seems that the code should be checking for this case instead of throwing null reference exception?

Thanks for your help.