Should this be doing one of those ExceptionDispatchInfo or whatever things?