Fixed null language field error