Adding Exception handling
Merge