TEIIDDES-1852 added null check for username & password values before adding to properties object