Wrote this patch in a couple of minutes, not tested - don't apply without testing
Would probably need an update/install task to make sure we create the templateExceptionHandler node - just to make its configuration explicit.