Merge "Fix typo in apierror message"