issue #2087: [dispatcher] Fixing BugTest/Bug422 crashes.