Ensure null safety.
Merge pull request #1 from hamnis/null-safety

Ensure null safety.