Guard against null values
Reenable unicode