Caught null reference exception
Merge pull request #90 from nolanfilter/Nolan

Caught null reference exception