Handle empty strings in flag name concatenation (#535)

Handle empty strings in flag name concatenation (#535) #1757