checking for nil in a few places.
Merge branch 'master' of github.com:dbenamy/monkey-shit