Merge "Fix error printing code."