Fixes check for null values for  language ID and country ID