Follow-up: add null-check