Improve ADDE scripting exceptions. [1682]

This is just a first pass.