#653940 follow-up by Damien Tournoud: Clean-up of error handling from first stab at test reporting fixes.