[Highlighting] Prevent deadlock in case of any return going on.

Possibly we should improve logging for it, but for now, this at least doesn't deadlock in case of error.