Updating: improving exception-handling.