Handle language
being blank (not just nil)
#1006
Merged
language
being blank (not just nil)
#1006