Fix for 'NoneType' is not iterable.
Merge pull request #14 from toudi/master

Fix for 'NoneType' is not iterable