[project] add strict null checks to improve logic

[project] add strict null checks to improve logic #532