Applying hotfix for #262 - null identifiers are checked upfront OM lookup