Merge "Fix a case that would trigger an account error."