Minor update to exception handling