Lets be careful not to deref nil
Merge pull request #136 from jcarroll3/noNilErrors

Lets be careful not to deref nil