[#801] Improve output so fails easier to find