Fixes log message when return_to match failures occur.

Fixes #249
Merge remote-tracking branch 'origin/v4.0' into v4.0
Applies fix for #209 to one more entrypoint for parsing XML that was missed initially.
Merge branch 'v4.0' into v4.1