Leaderboard error handling, still not fully right yet.  Need to merge pull