Nullability fixes
Merge pull request #41 from trask/nullability-fixes

Nullability fixes