Guard against invalid name value block headers.

So I think my git flow might be wonky, I wanted to send only 780a2cb and not the merge 	 2f1629d