Fix some consumers for #1601.  Don't leak out  if we are swallowing the raised exception