Merge "Add failure ports to error message"