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

Null safeguards Issue #127
Merge pull request #128 from jcarroll3/master

Drop indices and migrate relationship columns