Merge pull request #463 from Masterminds/fix/nil-pointer

Fixing possible nil pointer issues