Added OAuth uri's as constants. Removed null pointer returns.