diff --git a/SimulationRuntime/c/simulation/solver/perform_qss_simulation.c b/SimulationRuntime/c/simulation/solver/perform_qss_simulation.c
index 0d22823c32..7094360acd 100644
--- a/SimulationRuntime/c/simulation/solver/perform_qss_simulation.c
+++ b/SimulationRuntime/c/simulation/solver/perform_qss_simulation.c
@@ -365,8 +365,7 @@ int prefixedName_performQSSSimulation(DATA* data, threadData_t *threadData, SOLV
     /* check if terminate()=true */
     if (terminationTerminate)
     {
-      printInfo(stdout, TermInfo);
-      fputc('\n', stdout);
+      printInfo(LOG_STDOUT, TermInfo);
       infoStreamPrint(LOG_STDOUT, 0, "Simulation call terminate() at time %f\nMessage : %s", data->localData[0]->timeValue, TermMsg);
       simInfo->stopTime = solverInfo->currentTime;
     }
diff --git a/SimulationRuntime/c/simulation/solver/perform_simulation.c b/SimulationRuntime/c/simulation/solver/perform_simulation.c
index 9cd631483a..1769cdd5e6 100644
--- a/SimulationRuntime/c/simulation/solver/perform_simulation.c
+++ b/SimulationRuntime/c/simulation/solver/perform_simulation.c
@@ -258,8 +258,7 @@ static void checkSimulationTerminated(DATA* data, SOLVER_INFO* solverInfo)
 {
   if(terminationTerminate)
   {
-    printInfo(stdout, TermInfo);
-    fputc('\n', stdout);
+    printInfo(LOG_STDOUT, TermInfo);
     infoStreamPrint(LOG_STDOUT, 0, "Simulation call terminate() at time %f\nMessage : %s", data->localData[0]->timeValue, TermMsg);
     data->simulationInfo->stopTime = solverInfo->currentTime;
   }
diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
index aac93ec181..83b5bbaa12 100644
--- a/SimulationRuntime/c/util/omc_error.c
+++ b/SimulationRuntime/c/util/omc_error.c
@@ -159,19 +159,18 @@ void initDumpSystem()
   useStream[LOG_ASSERT] = 1;
 }
 
-void printInfo(FILE *stream, FILE_INFO info)
+void printInfo(int stream, FILE_INFO info)
 {
-  fprintf(stream, "[%s:%d:%d-%d:%d:%s]", info.filename, info.lineStart, info.colStart, info.lineEnd, info.colEnd, info.readonly ? "readonly" : "writable");
+  infoStreamPrint(stream, 0, "[%s:%d:%d-%d:%d:%s]", info.filename, info.lineStart, info.colStart, info.lineEnd, info.colEnd, info.readonly ? "readonly" : "writable");
 }
 
 void omc_assert_function(threadData_t* threadData, FILE_INFO info, const char *msg, ...)
 {
   va_list ap;
   va_start(ap,msg);
-  printInfo(stderr, info);
-  fputs("Modelica Assert: ", stderr);
-  vfprintf(stderr,msg,ap);
-  fputs("!\n", stderr);
+  printInfo(LOG_ASSERT, info);
+  errorStreamPrint(LOG_ASSERT, 0, "Modelica Assert: ");
+  va_errorStreamPrint(LOG_ASSERT, 0, msg, ap);
   va_end(ap);
   fflush(NULL);
   if (threadData) {
@@ -185,10 +184,9 @@ void omc_assert_warning_function(FILE_INFO info, const char *msg, ...)
 {
   va_list ap;
   va_start(ap,msg);
-  printInfo(stderr, info);
-  fputs("Warning, assertion triggered: ", stderr);
-  vfprintf(stderr,msg,ap);
-  fputs("!\n", stderr);
+  printInfo(LOG_ASSERT, info);
+  warningStreamPrint(LOG_ASSERT, 0, "Warning, assertion triggered: ");
+  va_warningStreamPrint(LOG_ASSERT, 0, msg, ap);
   va_end(ap);
   fflush(NULL);
 }
@@ -206,10 +204,9 @@ void omc_terminate_function(FILE_INFO info, const char *msg, ...)
 {
   va_list ap;
   va_start(ap,msg);
-  printInfo(stderr, info);
-  fputs("Modelica Terminate: ", stderr);
-  vfprintf(stderr,msg,ap);
-  fputs("!\n", stderr);
+  printInfo(LOG_STDOUT, info);
+  infoStreamPrint(LOG_STDOUT, 0, "Modelica Terminate: ");
+  va_infoStreamPrint(LOG_STDOUT, 0, msg, ap);
   va_end(ap);
   fflush(NULL);
   MMC_THROW();
diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
index 0bf9c74f45..70cfc29318 100644
--- a/SimulationRuntime/c/util/omc_error.h
+++ b/SimulationRuntime/c/util/omc_error.h
@@ -55,7 +55,7 @@ typedef struct _FILE_INFO
 
 #define omc_dummyFileInfo {"",-1,-1,-1,-1,1}
 
-DLLExport extern void printInfo(FILE *stream, FILE_INFO info);
+DLLExport extern void printInfo(int stream, FILE_INFO info);
 DLLExport extern void (*omc_assert)(threadData_t*, FILE_INFO, const char*, ...) __attribute__ ((noreturn));
 DLLExport extern void (*omc_assert_warning)(FILE_INFO, const char*, ...);
 DLLExport extern void (*omc_terminate)(FILE_INFO, const char*, ...);