[backport-1.6]: Improve backup errors

A solution for issue #2850 (closed) needs to be backported to 1.6.x