added if statement check
Merge branch 'feature-issue_140' of github.com:WalnutiQ/WalnutiQ into feature-issue_140