Modified  to handle More specific exceptions (#215)
Updated comment (#215)