Added Custom Exceptions
Resolved Merge Conflicts
resolved Conflicts