handles exception
Merge pull request #163 from sarakha63/development

handles exception