Fixed failure reporting bugs