Fixed NoneType Errors
Merge pull request #22 from shashankrao/master

Fixed NoneType Errors