Check if string is null before adding to treeset

Checking if string is null before adding to treeset. Adding null string
to treeset will lead to a null pointer crash.

CRs-Fixed: 1095523
Change-Id: I74e1c6be3381c05c66ab697d82401da8e27badec