fix: null checks and sanitization

This changelog entry has no additional details.