Merge pull request #28 from petevg/bug/fixes-for-null-cases