Bug in generic dialogs?

There is this annoying bug in the generic dialog support (and others I guess) where if you click on the dialog background you get "Not over a window" (not so worried about this although it would be nice to fix) however the error causes the dialog event loop handling code to bomb out so that if you click "ok" or whatever you get "No catch for tag: internal-dialog-box-finish". I'm not sure what the best way to fix it is. My first thought was to disable mouse-track but it looks like this error is signaled before any hooks are called. Catching the error in make-dialog-box doesn't seem to help either. Any ideas? andy