Fixed possible null reference (Issue #196)
Merge pull request #197 from texclayton/master

Fixed possible null reference (Issue #196)