Prevent crash when data cannot be mapped to the object
Merge remote-tracking branch 'origin/bugfix/27904'