Added error handling
Merge pull request #2 from zenachaturvedi/working-app

Added error handling