Minor fix for NULL conditional logic

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Added translation support for previous commit

Signed-off-by: Elliot Condon <e@elliotcondon.com>