diff --git a/source/transport/wan/MdtmMan.cpp b/source/transport/wan/MdtmMan.cpp
index 010a8c5745f20ea42d986e4472e18a32d7183111..c3fbdafd414ce82ceba78bfb8dbd0a7e950ce28b 100644
--- a/source/transport/wan/MdtmMan.cpp
+++ b/source/transport/wan/MdtmMan.cpp
@@ -22,8 +22,8 @@ MdtmMan::MdtmMan(const std::string localIP, const std::string remoteIP,
                  const bool debugMode)
 : Transport("File", mpiComm, debugMode), m_LocalIP{localIP},
   m_RemoteIP{remoteIP}, m_Mode{mode}, m_Prefix{prefix},
-  m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances}, m_Priorities{
-                                                                priorities}
+  m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances},
+  m_Priorities{priorities}
 {
 }
 
diff --git a/source/utilities/realtime/dataman/DataMan.cpp b/source/utilities/realtime/dataman/DataMan.cpp
index 337fc01876adf31727560f4e17a2cffea3ddc8a8..430c8e3633f3621504033a983f1390c1fb0f3a89 100644
--- a/source/utilities/realtime/dataman/DataMan.cpp
+++ b/source/utilities/realtime/dataman/DataMan.cpp
@@ -61,9 +61,11 @@ void DataMan::add_stream(json p_jmsg)
     }
 
     auto man = get_man(method);
-    man->init(p_jmsg);
-    this->add_next(method, man);
-
+    if (man)
+    {
+        man->init(p_jmsg);
+        this->add_next(method, man);
+    }
     add_man_to_path("zfp", method);
 }
 
diff --git a/source/utilities/realtime/dataman/DataManBase.cpp b/source/utilities/realtime/dataman/DataManBase.cpp
index 8fdf8cedd046ac1ee255a05f9e2503c4aad63f69..5081eba05fa813ab56d593a8eee2e9f270a32848 100644
--- a/source/utilities/realtime/dataman/DataManBase.cpp
+++ b/source/utilities/realtime/dataman/DataManBase.cpp
@@ -197,9 +197,12 @@ void DataManBase::add_man_to_path(std::string p_new, std::string p_path)
     if (m_next.count(p_path) > 0)
     {
         auto man = get_man(p_new);
-        man->add_next(p_path, m_next[p_path]);
-        this->add_next(p_new, man);
-        this->remove_next(p_path);
+        if (man)
+        {
+            man->add_next(p_path, m_next[p_path]);
+            this->add_next(p_new, man);
+            this->remove_next(p_path);
+        }
     }
 }