Merge "Changed onGetScores() to return null instead of throwing exception."