Debugging nil pointer error.
Merge pull request #231 from jaredbischof/master

Debugging nil pointer error.