R1:79e8a637c2ef

Minor, fail gracefully if there are data integrity problems until I can fix oauth transactions.