don't format None values

Change-Id: Idf7aa2dc847079c380edbe322f3cfb5025fe2f7f