diff --git a/daemon/json.cpp b/daemon/json.cpp
index 3f724db..f4fbde9 100644
--- a/daemon/json.cpp
+++ b/daemon/json.cpp
@@ -346,8 +346,12 @@ Config json_to_config_(std::istream& js, Config& config) {
   } catch (boost::property_tree::json_parser::json_parser_error& je) {
     throw std::runtime_error("error parsing JSON at line " +
                              std::to_string(je.line()) + " :" + je.message());
-  } catch (...) {
-    throw std::runtime_error("failed to convert a number");
+  } catch (std::invalid_argument& e) {
+    throw std::runtime_error("error parsing JSON: cannot perform number conversion");
+  } catch (std::out_of_range& e) {
+    throw std::runtime_error("error parsing JSON: number conversion out of range");
+  } catch (std::exception& e) {
+    throw std::runtime_error("error parsing JSON: " + std::string(e.what()));
   }
   return config;
 }
@@ -412,8 +416,12 @@ StreamSource json_to_source(const std::string& id, const std::string& json) {
   } catch (boost::property_tree::json_parser::json_parser_error& je) {
     throw std::runtime_error("error parsing JSON at line " +
                              std::to_string(je.line()) + " :" + je.message());
-  } catch (...) {
-    throw std::runtime_error("failed to convert a number");
+  } catch (std::invalid_argument& e) {
+    throw std::runtime_error("error parsing JSON: cannot perform number conversion");
+  } catch (std::out_of_range& e) {
+    throw std::runtime_error("error parsing JSON: number conversion out of range");
+  } catch (std::exception& e) {
+    throw std::runtime_error("error parsing JSON: " + std::string(e.what()));
   }
   return source;
 }
@@ -452,8 +460,12 @@ StreamSink json_to_sink(const std::string& id, const std::string& json) {
   } catch (boost::property_tree::json_parser::json_parser_error& je) {
     throw std::runtime_error("error parsing JSON at line " +
                              std::to_string(je.line()) + " :" + je.message());
-  } catch (...) {
-    throw std::runtime_error("failed to convert a number");
+  } catch (std::invalid_argument& e) {
+    throw std::runtime_error("error parsing JSON: cannot perform number conversion");
+  } catch (std::out_of_range& e) {
+    throw std::runtime_error("error parsing JSON: number conversion out of range");
+  } catch (std::exception& e) {
+    throw std::runtime_error("error parsing JSON: " + std::string(e.what()));
   }
   return sink;
 }
diff --git a/daemon/main.cpp b/daemon/main.cpp
index 96c8b44..a14466d 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -39,7 +39,7 @@ namespace po = boost::program_options;
 namespace postyle = boost::program_options::command_line_style;
 namespace logging = boost::log;
 
-static const std::string version("bondagit-1.6.5");
+static const std::string version("bondagit-1.6.6");
 static std::atomic<bool> terminate = false;
 
 void termination_handler(int signum) {
diff --git a/daemon/session_manager.cpp b/daemon/session_manager.cpp
index 7c1a18d..7e70c61 100644
--- a/daemon/session_manager.cpp
+++ b/daemon/session_manager.cpp
@@ -825,9 +825,15 @@ std::error_code SessionManager::add_sink(const StreamSink& sink) {
   BOOST_LOG_TRIVIAL(info) << "session_manager:: playout delay "
                           << info.stream.m_ui32PlayOutDelay;
 
-  auto mcast_mac_addr = get_mcast_mac_addr(info.stream.m_ui32DestIP);
-  std::copy(std::begin(mcast_mac_addr), std::end(mcast_mac_addr),
-            info.stream.m_ui8DestMAC);
+  if (IN_MULTICAST(info.stream.m_ui32DestIP)) {
+    auto mcast_mac_addr = get_mcast_mac_addr(info.stream.m_ui32DestIP);
+    std::copy(std::begin(mcast_mac_addr), std::end(mcast_mac_addr),
+              info.stream.m_ui8DestMAC);
+  } else {
+    auto mac_addr = config_->get_mac_addr();
+    std::copy(std::begin(mac_addr), std::end(mac_addr),
+              info.stream.m_ui8DestMAC);
+  }
 
   std::unique_lock sinks_lock(sinks_mutex_);
   auto const it = sinks_.find(sink.id);