Null safeguards Issue #127