issue #20874: trap for common error
Merge pull request #610 from shackbarth/20874

issue #20874: trap for common error