     /* Cancel SD */
 -   cancel_storage_daemon_job(jcr);
 -   wait_for_storage_daemon_termination(jcr);
-+   wait_for_job_termination(jcr);
++   wait_for_job_termination(jcr, 300);
     Dmsg1(400, "after wait for sd. use=%d\n", jcr->use_count());
     return false;
  }

 
    jcr->JobType = JT_VERIFY;
    if (sscanf(dir->msg, verifycmd, level) != 1) {
@@ -1585,13 +1587,6 @@
 
    bnet_sig(dir, BNET_EOD);
 

-      jcr->pki_encrypt);
-   Dmsg1(110, "End FD msg: %s\n", dir->msg);
-
-   /* Inform Director that we are done */
-   bnet_sig(dir, BNET_TERMINATE);
    return 0;                          /* return and terminate command loop */
 }
 
@@ -1609,7 +1602,6 @@
    bool use_regexwhere=false;
    int prefix_links;
    char replace;
