Merge "Fix potential null string comparison." into tm-dev