Lets be careful not to deref nil
Merge pull request #135 from jcarroll3/master

Fixing warnings again (tests passing)
Merge pull request #136 from jcarroll3/noNilErrors

Lets be careful not to deref nil