Fixing nil dereference.
Merge pull request #295 from jaredbischof/master

Fixing nil dereference.