Summary: Add missed exceptions check
Reviewed-by: dsamersoff, sla
Contributed-by: NJini Susan George <jini.george@oracle.com>