remove possiblities of nil where it makes sense to
Merge pull request #51 from estately/remove_nil_errors

remove possiblities of nil where it makes sense to