error handling
Merge pull request #2 from charugvvdn/restructuring

error handling