Merge pull request #35 from NathanFrench/feature/null_handling

Check err the nullz.