Merge "Fix error message strings"