Avoid throwing / catching exceptions when upgrading delegates (#1491) Was very slow when the debugger is attached