Adding exception classes and do some corrections
Adding classes