Merge pull request #83 in ZP/z-push from bugfix/ZP-394-delayed-terminating-of-searches-throws to develop

* commit '10d06e4c':
  ZP-394 Delayed terminating of searches throws warning.

(cherry picked from commit 5998b9dc)