Null safeguards Issue #127
Merge pull request #129 from jasper-ch-chan/master

Null safeguards Issue #127