! Updated the error message for exceptions
! updated the comments and doc