Merge pull request #55 from sajinidesilva/exceptionHandling

Handled exception properly
Introduced new exception class