Identifier: Error handling fix.
See merge request !57852 (merged)
Identifier: Error handling fix. See merge request !57852 (cherry picked from commit 07835681) 3dc454d7 Identifier: Error handling fix.