language is now optional, so remove the null check