more robust reporting after error.
@otfrom rubber duckie - you're the one.