added null check
added empty test
added member of