Fixing null/nil bug.
Merge pull request #71 from toomuchpete/fix/pod_bugs

Fixing null/nil bug.