Merge "Check if main user is null" into main