This one is an updated patch, to avoid further processing when an exception i...