Provide better handling of None
Merge pull request #152 from bbelchak/suffixes

Provide better handling of None