Adding additional check for blank language

Addresses #2366