Add missing null-check