don't try to concatenate a string with a variable that can be None

Change-Id: I7226339858b60a0f390389242e63caae5eadb3d8
Partial-Bug: #1260726