diff --git a/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp b/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp
index 612f3bdf00..92c3ba6648 100644
--- a/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp
+++ b/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterCSV.cpp
@@ -1,101 +1,107 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkNavigationDataSetWriterCSV.h"
 #include <fstream>
 #include <mitkIOMimeTypes.h>
 
 mitk::NavigationDataSetWriterCSV::NavigationDataSetWriterCSV() : AbstractFileWriter(NavigationDataSet::GetStaticNameOfClass(),
   CustomMimeType(NAVIGATIONDATASETCSV_MIMETYPE()),
   "MITK NavigationDataSet Reader (CSV)")
 {
   RegisterService();
 }
 
 mitk::NavigationDataSetWriterCSV::~NavigationDataSetWriterCSV()
 {}
 
 mitk::NavigationDataSetWriterCSV::NavigationDataSetWriterCSV(const mitk::NavigationDataSetWriterCSV& other) : AbstractFileWriter(other)
 {
 }
 
 mitk::NavigationDataSetWriterCSV* mitk::NavigationDataSetWriterCSV::Clone() const
 {
   return new NavigationDataSetWriterCSV(*this);
 }
 
 void mitk::NavigationDataSetWriterCSV::Write()
 {
   std::ostream* out = GetOutputStream();
+  if (out == nullptr)
+  {
+    out = new std::ofstream(GetOutputLocation().c_str());
+  }
   mitk::NavigationDataSet::ConstPointer data = dynamic_cast<const NavigationDataSet*> (this->GetInput());
 
     //save old locale
   char * oldLocale;
   oldLocale = setlocale( LC_ALL, nullptr );
 
   //define own locale
   std::locale C("C");
   setlocale( LC_ALL, "C" );
 
   //write header
   unsigned int numberOfTools = data->GetNumberOfTools();
   for (unsigned int index = 0; index < numberOfTools; index++){ *out << "TimeStamp_Tool" << index <<
                                                                            ";Valid_Tool" << index <<
                                                                            ";X_Tool" << index <<
                                                                            ";Y_Tool" << index <<
                                                                            ";Z_Tool" << index <<
                                                                            ";QX_Tool" << index <<
                                                                            ";QY_Tool" << index <<
                                                                            ";QZ_Tool" << index <<
                                                                            ";QR_Tool" << index << ";";}
   *out << "\n";
 
   out->precision(15); // rounding precision because we don't want to loose data.
 
   //write data
   MITK_INFO << "Number of timesteps: " << data->Size();
   for (unsigned int i=0; i<data->Size(); i++)
   {
     std::vector< mitk::NavigationData::Pointer > NavigationDatasOfCurrentStep = data->GetTimeStep(i);
     for (unsigned int toolIndex = 0; toolIndex < numberOfTools; toolIndex++)
     {
       mitk::NavigationData::Pointer nd = NavigationDatasOfCurrentStep.at(toolIndex);
       *out             << nd->GetTimeStamp() << ";"
                        << nd->IsDataValid() << ";"
                        << nd->GetPosition()[0] << ";"
                        << nd->GetPosition()[1] << ";"
                        << nd->GetPosition()[2] << ";"
                        << nd->GetOrientation()[0] << ";"
                        << nd->GetOrientation()[1] << ";"
                        << nd->GetOrientation()[2] << ";"
                        << nd->GetOrientation()[3] << ";";
     }
     *out << "\n";
   }
 
+  out->flush();
+  delete out;
   //switch back to old locale
   setlocale( LC_ALL, oldLocale );
 }
 
 mitk::CustomMimeType mitk::NavigationDataSetWriterCSV::NAVIGATIONDATASETCSV_MIMETYPE()
 {
   mitk::CustomMimeType mimeType(IOMimeTypes::DEFAULT_BASE_NAME() + ".NavigationDataSet.csv");
   std::string category = "NavigationDataSet";
   mimeType.SetComment("NavigationDataSet (csv)");
   mimeType.SetCategory(category);
   mimeType.AddExtension("csv");
   return mimeType;
 }
\ No newline at end of file
diff --git a/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp b/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp
index 0358710abf..f83826f2e4 100644
--- a/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp
+++ b/Modules/IGTBase/autoload/IO/mitkNavigationDataSetWriterXML.cpp
@@ -1,153 +1,158 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // MITK
 #include "mitkNavigationDataSetWriterXML.h"
 
 // Third Party
 #include <tinyxml.h>
 #include <itksys/SystemTools.hxx>
 #include <fstream>
 #include <iostream>
 #include <mitkIOMimeTypes.h>
 
 mitk::NavigationDataSetWriterXML::NavigationDataSetWriterXML() : AbstractFileWriter(NavigationDataSet::GetStaticNameOfClass(),
   CustomMimeType(NAVIGATIONDATASETXML_MIMETYPE()),
   "MITK NavigationDataSet Reader (XML)")
 {
   RegisterService();
 }
 
 mitk::NavigationDataSetWriterXML::NavigationDataSetWriterXML(const mitk::NavigationDataSetWriterXML& other) : AbstractFileWriter(other)
 {
 }
 
 mitk::NavigationDataSetWriterXML::~NavigationDataSetWriterXML()
 {
 }
 
 mitk::NavigationDataSetWriterXML* mitk::NavigationDataSetWriterXML::Clone() const
 {
   return new NavigationDataSetWriterXML(*this);
 }
 
 void mitk::NavigationDataSetWriterXML::Write()
 {
   std::ostream* out = GetOutputStream();
+  if (out == nullptr)
+  {
+    out = new std::ofstream( GetOutputLocation().c_str() );
+  }
   mitk::NavigationDataSet::ConstPointer data = dynamic_cast<const NavigationDataSet*> (this->GetInput());
 
   //save old locale
   char * oldLocale;
   oldLocale = setlocale( LC_ALL, nullptr );
 
   StreamHeader(out, data);
   StreamData(out, data);
   StreamFooter(out);
 
   // Cleanup
   out->flush();
+  delete out;
 
   //switch back to old locale
   setlocale( LC_ALL, oldLocale );
 }
 
 void mitk::NavigationDataSetWriterXML::StreamHeader (std::ostream* stream, mitk::NavigationDataSet::ConstPointer data)
 {
   stream->precision(10);
 
   //TODO store date and GMT time
   //checking if the stream is good
   if (stream->good())
   {
     *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" << std::endl;
     /**m_Stream << "<Version Ver=\"1\" />" << std::endl;*/
     // should be a generic version, meaning a member variable, which has the actual version
     *stream << "    " << "<Data ToolCount=\"" << data->GetNumberOfTools() << "\" version=\"1.0\">" << std::endl;
   }
 }
 
 void mitk::NavigationDataSetWriterXML::StreamData (std::ostream* stream, mitk::NavigationDataSet::ConstPointer data)
 {
   // For each time step in the Dataset
   for (auto it = data->Begin(); it != data->End(); it++)
   {
     for (std::size_t toolIndex = 0; toolIndex < it->size(); toolIndex++)
     {
       mitk::NavigationData::Pointer nd = it->at(toolIndex);
       auto  elem = new TiXmlElement("ND");
 
       elem->SetDoubleAttribute("Time", nd->GetIGTTimeStamp());
       // elem->SetAttribute("SystemTime", sysTimeStr); // tag for system time
       elem->SetDoubleAttribute("Tool", toolIndex);
       elem->SetDoubleAttribute("X", nd->GetPosition()[0]);
       elem->SetDoubleAttribute("Y", nd->GetPosition()[1]);
       elem->SetDoubleAttribute("Z", nd->GetPosition()[2]);
 
       elem->SetDoubleAttribute("QX", nd->GetOrientation()[0]);
       elem->SetDoubleAttribute("QY", nd->GetOrientation()[1]);
       elem->SetDoubleAttribute("QZ", nd->GetOrientation()[2]);
       elem->SetDoubleAttribute("QR", nd->GetOrientation()[3]);
 
       elem->SetDoubleAttribute("C00", nd->GetCovErrorMatrix()[0][0]);
       elem->SetDoubleAttribute("C01", nd->GetCovErrorMatrix()[0][1]);
       elem->SetDoubleAttribute("C02", nd->GetCovErrorMatrix()[0][2]);
       elem->SetDoubleAttribute("C03", nd->GetCovErrorMatrix()[0][3]);
       elem->SetDoubleAttribute("C04", nd->GetCovErrorMatrix()[0][4]);
       elem->SetDoubleAttribute("C05", nd->GetCovErrorMatrix()[0][5]);
       elem->SetDoubleAttribute("C10", nd->GetCovErrorMatrix()[1][0]);
       elem->SetDoubleAttribute("C11", nd->GetCovErrorMatrix()[1][1]);
       elem->SetDoubleAttribute("C12", nd->GetCovErrorMatrix()[1][2]);
       elem->SetDoubleAttribute("C13", nd->GetCovErrorMatrix()[1][3]);
       elem->SetDoubleAttribute("C14", nd->GetCovErrorMatrix()[1][4]);
       elem->SetDoubleAttribute("C15", nd->GetCovErrorMatrix()[1][5]);
 
       if (nd->IsDataValid())
         elem->SetAttribute("Valid",1);
       else
         elem->SetAttribute("Valid",0);
 
       if (nd->GetHasOrientation())
         elem->SetAttribute("hO",1);
       else
         elem->SetAttribute("hO",0);
 
       if (nd->GetHasPosition())
         elem->SetAttribute("hP",1);
       else
         elem->SetAttribute("hP",0);
 
       *stream << "        " << *elem << std::endl;
 
       delete elem;
     }
   }
 }
 
 void mitk::NavigationDataSetWriterXML::StreamFooter (std::ostream* stream)
 {
   *stream << "</Data>" << std::endl;
 }
 
 
 mitk::CustomMimeType mitk::NavigationDataSetWriterXML::NAVIGATIONDATASETXML_MIMETYPE()
 {
   mitk::CustomMimeType mimeType(IOMimeTypes::DEFAULT_BASE_NAME() + ".NavigationDataSet.xml");
   std::string category = "NavigationDataSet";
   mimeType.SetComment("NavigationDataSet (XML)");
   mimeType.SetCategory(category);
   mimeType.AddExtension("xml");
   return mimeType;
 }
\ No newline at end of file