Committing the error/exception handling code - JJ