diff --git a/daggyd/daggyd/daggyd.cpp b/daggyd/daggyd/daggyd.cpp
index 64ee6e0..368842c 100644
--- a/daggyd/daggyd/daggyd.cpp
+++ b/daggyd/daggyd/daggyd.cpp
@@ -209,6 +209,7 @@ std::unique_ptr<de::TaskExecutor> executorFactory(const rj::Value &config)
             "DaggyRunnerExecutor runners must be an array of urls");
       exe->addRunner(runners[i].GetString());
     }
+    return exe;
   }
   else if (name == "SSHTaskExecutor") {
     if (!execConfig.HasMember("hosts"))
@@ -251,7 +252,7 @@ std::unique_ptr<de::TaskExecutor> executorFactory(const rj::Value &config)
     return exe;
   }
 
-  throw std::runtime_error("Unknown executor type: " + name);
+  throw std::runtime_error("Unknown executor type: >>" + name + "<<");
 }
 
 int main(int argc, char **argv)
diff --git a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
index a830264..7db6a00 100644
--- a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
+++ b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
@@ -88,6 +88,7 @@ DaggyRunnerTaskExecutor::~DaggyRunnerTaskExecutor()
 {
   running_ = false;
   monitorWorker_.join();
+  dispatchWorker_.join();
 }
 
 std::string DaggyRunnerTaskExecutor::description() const