*8668* Improve handling of invalid/missing identifiers