Add additional check
Merge pull request #164 from dreamteam69/master

Add additional check