I hope that the prepared system modification would enable to wrap this up to custom exception automatically with the locator in the exception, etc. ...