diff --git a/lib/Wrapper.cpp b/lib/Wrapper.cpp
index 82ba36580e564db8559a43ca410252ea0b7536fc..0d7c87105992c02bb233aeb7d37bf339d089866b 100644
--- a/lib/Wrapper.cpp
+++ b/lib/Wrapper.cpp
@@ -209,6 +209,9 @@ int MPI_Finalize() {
   PMPI_Barrier(MPI_COMM_WORLD);
   freeTeamComm();
   Timing::outputTiming();
+#ifdef DirtyCleanUp
+  return MPI_SUCCESS;
+#endif
   return PMPI_Finalize();
 }