Merge pull request #3 from OctoFalcon/master

Merge
Added null checks
Merge pull request #15 from adikampli/master

Added null checks