Added try and exept
Merge branch 'master' into feature1
Merge pull request #9 from memsrojo/feature1

Try and except was added