-typo fixes.
- null safety check.