[#7857] test fix, improve error handling and logging
2 files changed