diff --git a/src/BlockVector.cc b/src/BlockVector.cc
index 40271750..9a411ebe 100644
--- a/src/BlockVector.cc
+++ b/src/BlockVector.cc
@@ -209,7 +209,7 @@ void BlockVector<ScalarType, MemorySpaceType>::allocate_storage()
         std::cerr << "ERROR BlockVector: trying to use allocation "
                   << size_storage_ << " bigger than initialy preallocated "
                   << allocated_size_storage_ << "!!!" << std::endl;
-        ct.global_exit(0);
+        ct.global_exit();
     }
     storage_ = class_storage_[my_allocation_];
     assert(class_storage_.size() > 0);
diff --git a/src/Control.cc b/src/Control.cc
index d266aa2e..33fd93c4 100644
--- a/src/Control.cc
+++ b/src/Control.cc
@@ -495,7 +495,7 @@ void Control::sync(void)
         if (mpirc != MPI_SUCCESS)
         {
             (*MPIdata::sout) << "MPI Bcast of Control failed!!!" << std::endl;
-            MPI_Abort(comm_global_, 2);
+            MPI_Abort(comm_global_, EXIT_FAILURE);
         }
     };
 
@@ -1152,7 +1152,7 @@ void Control::setTolEigenvalueGram(const float tol)
                          << threshold_eigenvalue_gram_ << std::endl;
 }
 
-void Control::global_exit(int i) { MPI_Abort(comm_global_, i); }
+void Control::global_exit() { MPI_Abort(comm_global_, EXIT_FAILURE); }
 
 void Control::setSpecies(Potentials& pot)
 {
@@ -1342,7 +1342,7 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
             (*MPIdata::serr)
                 << "ERROR in Control::setOptions: Invalid restart dump type"
                 << std::endl;
-            MPI_Abort(comm_global_, 2);
+            MPI_Abort(comm_global_, EXIT_FAILURE);
         }
 
         (*MPIdata::sout) << "Output restart file: " << out_restart_file
@@ -1549,14 +1549,14 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
             else
             {
                 std::cerr << "ERROR: Spread Penalty needs a type" << std::endl;
-                MPI_Abort(comm_global_, 0);
+                MPI_Abort(comm_global_, EXIT_FAILURE);
             }
 
             if (spread_penalty_target_ <= 0.)
             {
                 (*MPIdata::sout) << "Invalid value for Spread Penalty target: "
                                  << spread_penalty_target_ << std::endl;
-                MPI_Abort(comm_global_, 0);
+                MPI_Abort(comm_global_, EXIT_FAILURE);
             }
         }
 
@@ -1599,7 +1599,7 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
                 {
                     (*MPIdata::sout) << "Invalid value for Thermostat.type: "
                                      << thermostat_type << std::endl;
-                    MPI_Abort(comm_global_, 0);
+                    MPI_Abort(comm_global_, EXIT_FAILURE);
                 }
 
                 tkel = vm["Thermostat.temperature"].as<float>();
@@ -1608,7 +1608,7 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
                     (*MPIdata::sout)
                         << "Invalid value for Thermostat.temperature: " << tkel
                         << std::endl;
-                    MPI_Abort(comm_global_, 0);
+                    MPI_Abort(comm_global_, EXIT_FAILURE);
                 }
                 thtime = vm["Thermostat.relax_time"].as<float>();
                 if (thtime < 0.)
@@ -1616,7 +1616,7 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
                     (*MPIdata::sout)
                         << "Invalid value for Thermostat.relax_time: " << thtime
                         << std::endl;
-                    MPI_Abort(comm_global_, 0);
+                    MPI_Abort(comm_global_, EXIT_FAILURE);
                 }
 
                 if (str.compare("SCALING") == 0)
@@ -1627,7 +1627,7 @@ void Control::setOptions(const boost::program_options::variables_map& vm)
                         (*MPIdata::sout)
                             << "Invalid value for Thermostat.width: " << thwidth
                             << std::endl;
-                        MPI_Abort(comm_global_, 0);
+                        MPI_Abort(comm_global_, EXIT_FAILURE);
                     }
                 }
             }
diff --git a/src/Control.h b/src/Control.h
index bd4a7d96..9481cc24 100644
--- a/src/Control.h
+++ b/src/Control.h
@@ -346,7 +346,7 @@ class Control
         return pair_mlwf_distance_threshold_;
     }
 
-    void global_exit(int i);
+    void global_exit();
 
     bool Mehrstellen() const { return (lap_type == 0 || lap_type == 10); }
 
diff --git a/src/DistMatrix/BlacsContext.cc b/src/DistMatrix/BlacsContext.cc
index e87cb7dd..7610a3cb 100644
--- a/src/DistMatrix/BlacsContext.cc
+++ b/src/DistMatrix/BlacsContext.cc
@@ -191,7 +191,7 @@ BlacsContext::BlacsContext(
     {
         std::cerr << " BlacsContext::BlacsContext: type = " << type
                   << " is an incorrect parameter" << std::endl;
-        MPI_Abort(comm_global, 0);
+        MPI_Abort(comm_global, EXIT_FAILURE);
     }
 
     size_ = nprow_ * npcol_;
@@ -222,7 +222,7 @@ BlacsContext::BlacsContext(
     {
         std::cerr << " nprocs_=" << nprocs_ << std::endl;
         std::cerr << " BlacsContext nprow*npcol > nprocs_" << std::endl;
-        MPI_Abort(comm_global, 0);
+        MPI_Abort(comm_global, EXIT_FAILURE);
     }
 
     ictxt_ = Csys2blacs_handle(comm_global_);
@@ -252,7 +252,7 @@ BlacsContext::BlacsContext(
     {
         std::cerr << " BlacsContext::BlacsContext: invalid parameters"
                   << " in " << __FILE__ << ":" << __LINE__ << std::endl;
-        MPI_Abort(comm_global, 0);
+        MPI_Abort(comm_global, EXIT_FAILURE);
     }
     int* pmap = new int[nprow * npcol];
     // build pmap
@@ -296,7 +296,7 @@ BlacsContext::BlacsContext(BlacsContext& bc, const int irow, const int icol,
     {
         std::cerr << " BlacsContext::BlacsContext: invalid parameters"
                   << std::endl;
-        MPI_Abort(comm_global_, 0);
+        MPI_Abort(comm_global_, EXIT_FAILURE);
     }
     int* pmap = new int[nprow * npcol];
     // build pmap
@@ -350,7 +350,7 @@ BlacsContext::BlacsContext(const BlacsContext& bc, const char type)
         std::cerr
             << " BlacsContext::BlacsContext: row/col incorrect parameter: "
             << type << std::endl;
-        MPI_Abort(comm_global_, 0);
+        MPI_Abort(comm_global_, EXIT_FAILURE);
     }
 
     ictxt_ = Csys2blacs_handle(comm_global_);
diff --git a/src/DistMatrix/DistMatrix.h b/src/DistMatrix/DistMatrix.h
index f56df2b4..175fbd9b 100644
--- a/src/DistMatrix/DistMatrix.h
+++ b/src/DistMatrix/DistMatrix.h
@@ -28,7 +28,7 @@
     std::cerr << "ERROR in file " << __FILE__ << " at line " << __LINE__       \
               << std::endl;                                                    \
     std::cerr << "Error Message: " << X << std::endl;                          \
-    MPI_Abort(comm_global_, 2);
+    MPI_Abort(comm_global_, EXIT_FAILURE);
 
 #endif
 
diff --git a/src/DistanceConstraint.cc b/src/DistanceConstraint.cc
index d5175d7e..6d046f3b 100644
--- a/src/DistanceConstraint.cc
+++ b/src/DistanceConstraint.cc
@@ -99,7 +99,7 @@ bool DistanceConstraint::enforce(void)
     {
         cerr << "mype=" << mype << ", tau1p_[0]=" << tau1p_[0] << endl;
         cerr << "mype=" << mype << ", tau2p_[0]=" << tau2p_[0] << endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
     }
     if (locally_owned_)
         (*MPIdata::sout) << setprecision(8) << "DistanceConstraint, d=" << d
diff --git a/src/ExtendedGridOrbitals.cc b/src/ExtendedGridOrbitals.cc
index 19c0d26b..07face7c 100644
--- a/src/ExtendedGridOrbitals.cc
+++ b/src/ExtendedGridOrbitals.cc
@@ -1239,7 +1239,7 @@ double ExtendedGridOrbitals::dotProduct(
                             "dot product type"
                          << std::endl;
         Control& ct = *(Control::instance());
-        ct.global_exit(2);
+        ct.global_exit();
     }
 
     dot_product_tm_.stop();
diff --git a/src/IonicAlgorithm.cc b/src/IonicAlgorithm.cc
index 37a077e4..e804077a 100644
--- a/src/IonicAlgorithm.cc
+++ b/src/IonicAlgorithm.cc
@@ -57,7 +57,7 @@ void IonicAlgorithm<OrbitalsType>::init(HDFrestart* h5f_file)
     if (ct.restart_info > 0)
     {
         int status = stepper_->init(*h5f_file);
-        if (status < 0) ct.global_exit(2);
+        if (status < 0) ct.global_exit();
 
         // if restart data for lbfgs found
         if (status == 0)
diff --git a/src/Ions.cc b/src/Ions.cc
index 09b97d2e..9af0a64e 100644
--- a/src/Ions.cc
+++ b/src/Ions.cc
@@ -1961,7 +1961,6 @@ int Ions::read1atom(std::ifstream* tfile, const bool cell_relative)
     double velocity[3] = { 0., 0., 0. };
 
     MGmol_MPI& mmpi(*(MGmol_MPI::instance()));
-    Control& ct(*(Control::instance()));
 
     short movable = 0;
     std::string query;
@@ -2005,7 +2004,7 @@ int Ions::read1atom(std::ifstream* tfile, const bool cell_relative)
         {
             std::cerr << "ERROR: Invalid name read in input file: " << name_read
                       << std::endl;
-            ct.global_exit(2);
+            mmpi.abort();
         }
         short dummy;
         ss >> dummy; // not used anymore (was species index)
diff --git a/src/LDAFunctional.cc b/src/LDAFunctional.cc
index 4b60b51e..89f5ee5f 100644
--- a/src/LDAFunctional.cc
+++ b/src/LDAFunctional.cc
@@ -120,8 +120,7 @@ double LDAFunctional::computeRhoDotExc() const
     if (rc != MPI_SUCCESS)
     {
         (*MPIdata::sout) << "MPI_Allreduce double sum failed!!!" << endl;
-        Control& ct = *(Control::instance());
-        ct.global_exit(2);
+        mmpi.abort();
     }
     exc = (POTDTYPE)sum;
     return exc;
diff --git a/src/LocalizationRegions.cc b/src/LocalizationRegions.cc
index 60f28301..f0f96412 100644
--- a/src/LocalizationRegions.cc
+++ b/src/LocalizationRegions.cc
@@ -492,7 +492,7 @@ void LocalizationRegions::bcastLRs()
         cerr << "ERROR!!!! LocalizationRegions::bcast(), Failure in MPI_Bcast "
                 "of 'nglobal_'!!!"
              << endl;
-        MPI_Abort(comm, 0);
+        MPI_Abort(comm, EXIT_FAILURE);
     }
 
     if (nglobal_ == 0) return;
@@ -522,7 +522,7 @@ void LocalizationRegions::bcastLRs()
             cerr << "ERROR!!!! LocalizationRegions::bcast(), Failure in "
                     "MPI_Bcast of 'centers'!!!"
                  << endl;
-            MPI_Abort(comm, 0);
+            MPI_Abort(comm, EXIT_FAILURE);
         }
         vector<LRData>::iterator it = all_regions_.begin();
         int i                       = 0;
@@ -554,7 +554,7 @@ void LocalizationRegions::bcastLRs()
             cerr << "ERROR!!!! LocalizationRegions::bcast(), Failure in "
                     "MPI_Bcast of 'radius'!!!"
                  << endl;
-            MPI_Abort(comm, 0);
+            MPI_Abort(comm, EXIT_FAILURE);
         }
         it = all_regions_.begin();
         i  = 0;
@@ -642,7 +642,7 @@ void LocalizationRegions::bcastLRs()
         cerr << "ERROR!!!! LocalizationRegions::bcast(), Failure in MPI_Bcast "
                 "of 'volume'!!!"
              << endl;
-        MPI_Abort(comm, 0);
+        MPI_Abort(comm, EXIT_FAILURE);
     }
     if (ct.verbose > 0)
         printWithTimeStamp("LocalizationRegions::bcast() done...", cout);
@@ -915,19 +915,9 @@ void LocalizationRegions::setupLocalRegionsFromOverlapRegions()
         cerr << "ERROR in distribution of localization centers: count=" << count
              << endl;
         cerr << "global number of regions=" << nglobal_ << endl;
-        MPI_Abort(MPI_COMM_WORLD, 1);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
     }
 
-#if 0    
-    //if(onpe0)
-    if( count!=nglobal_ )
-    {
-        cerr<<"ERROR in distribution of localization centers: count="<<count
-            <<", regions_.size()="<<regions_.size()
-            <<endl;
-        MPI_Abort(MPI_COMM_WORLD,1);
-    }
-#endif
     gid_local_regions_set_ = true;
     setupLocalRegionsFromOverlapRegions_tm_.stop();
 }
diff --git a/src/LocalizationRegions.h b/src/LocalizationRegions.h
index 9b8914e1..c2aad575 100644
--- a/src/LocalizationRegions.h
+++ b/src/LocalizationRegions.h
@@ -242,7 +242,7 @@ class LocalizationRegions
         std::cout << "mype:" << mype
                   << ", WARNING: didn't find a center for gid=" << gid
                   << std::endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
         return (overlap_regions_.end())->center;
     }
 
@@ -261,7 +261,7 @@ class LocalizationRegions
         std::cout << "mype:" << mype
                   << ", WARNING: didn't find a color for gid=" << gid
                   << std::endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
         return -1;
     }
 
@@ -284,7 +284,7 @@ class LocalizationRegions
         std::cout << "mype:" << mype
                   << ", WARNING: didn't find a center and radius for gid="
                   << gid << std::endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
 
         center = (overlap_regions_.end())->center;
         return (overlap_regions_.end())->radius;
diff --git a/src/MDfiles.cc b/src/MDfiles.cc
index 8349c304..a302ebff 100644
--- a/src/MDfiles.cc
+++ b/src/MDfiles.cc
@@ -236,9 +236,9 @@ void MDfiles::printDataInFiles(vector<string>& ions_names, vector<double>& tau,
             ofstream tfile(coord_dir_name.data(), ios::out);
             if (!tfile.is_open())
             {
-                cerr << " Unable to open file " << coord_dir_name.data()
-                     << endl;
-                ct.global_exit(0);
+                std::cerr << " Unable to open file " << coord_dir_name.data()
+                          << endl;
+                ct.global_exit();
             }
             // cout<<"recvbuf.size()="<<recvbuf.size()<<endl;
             // tfile<<"recvbuf.size()="<<recvbuf.size()<<endl;
@@ -279,8 +279,9 @@ void MDfiles::printDataInFiles(vector<string>& ions_names, vector<double>& tau,
             ofstream tfile2(wf_dir_name.data(), ios::out);
             if (!tfile2.is_open())
             {
-                cerr << " Unable to open file " << wf_dir_name.data() << endl;
-                ct.global_exit(0);
+                std::cerr << " Unable to open file " << wf_dir_name.data()
+                          << std::endl;
+                ct.global_exit();
             }
             const int na = recvbufspreads.size();
             for (int i = 0; i < na; i++)
diff --git a/src/MGmol.cc b/src/MGmol.cc
index 439f4fac..8d87f1c1 100644
--- a/src/MGmol.cc
+++ b/src/MGmol.cc
@@ -728,12 +728,6 @@ void MGmol<OrbitalsType>::write_header()
     if (ct.isLocMode() && ct.verbose > 3) lrs_->printAllRegions(os_);
 }
 
-template <class OrbitalsType>
-void MGmol<OrbitalsType>::global_exit(int i)
-{
-    MPI_Abort(comm_, i);
-}
-
 template <class OrbitalsType>
 void MGmol<OrbitalsType>::check_anisotropy()
 {
@@ -748,7 +742,8 @@ void MGmol<OrbitalsType>::check_anisotropy()
                              << ", hmin=" << mygrid.hmin() << std::endl;
         (*MPIdata::serr) << "init: Anisotropy too large: "
                          << mygrid.anisotropy() << std::endl;
-        global_exit(2);
+        MGmol_MPI& mmpi = *(MGmol_MPI::instance());
+        mmpi.abort();
     }
 }
 
@@ -1046,7 +1041,8 @@ void MGmol<OrbitalsType>::setup()
     total_tm_.start();
     setup_tm_.start();
 
-    Control& ct = *(Control::instance());
+    Control& ct     = *(Control::instance());
+    MGmol_MPI& mmpi = *(MGmol_MPI::instance());
 
     if (ct.verbose > 0)
         printWithTimeStamp("MGmol<OrbitalsType>::setup()...", os_);
@@ -1064,7 +1060,8 @@ void MGmol<OrbitalsType>::setup()
 #else
     int ierr = initial<MemorySpace::Host>();
 #endif
-    if (ierr < 0) global_exit(0);
+
+    if (ierr < 0) mmpi.abort();
 
     // Write header to stdout
     write_header();
diff --git a/src/MGmol.h b/src/MGmol.h
index 4d82dd64..bccbc7af 100644
--- a/src/MGmol.h
+++ b/src/MGmol.h
@@ -221,7 +221,6 @@ class MGmol : public MGmolInterface
     void initNuc(Ions& ions);
     void initKBR();
 
-    void global_exit(int i);
     void printEigAndOcc();
 
     int readCoordinates(std::ifstream* tfile, const bool cell_relative);
diff --git a/src/NonOrthoDMStrategy.cc b/src/NonOrthoDMStrategy.cc
index 5452592f..3835b039 100644
--- a/src/NonOrthoDMStrategy.cc
+++ b/src/NonOrthoDMStrategy.cc
@@ -46,7 +46,7 @@ int NonOrthoDMStrategy<OrbitalsType>::update(OrbitalsType& orbitals)
     {
         std::cerr << "NonOrthoDMStrategy, Invalid mixing value: " << mix_
                   << std::endl;
-        MPI_Abort(mmpi.commSameSpin(), 0);
+        MPI_Abort(mmpi.commSameSpin(), EXIT_FAILURE);
     }
 
     if (mmpi.PE0() && ct.verbose > 2)
diff --git a/src/PBEFunctional.cc b/src/PBEFunctional.cc
index 4a878c3c..29151a14 100644
--- a/src/PBEFunctional.cc
+++ b/src/PBEFunctional.cc
@@ -167,8 +167,7 @@ double PBEFunctional::computeRhoDotExc() const
     if (rc != MPI_SUCCESS)
     {
         (*MPIdata::sout) << "MPI_Allreduce double sum failed!!!" << std::endl;
-        Control& ct = *(Control::instance());
-        ct.global_exit(2);
+        mmpi.abort();
     }
     exc = sum;
     return exc;
diff --git a/src/Potentials.cc b/src/Potentials.cc
index a0ff3f1a..ebe42320 100644
--- a/src/Potentials.cc
+++ b/src/Potentials.cc
@@ -185,8 +185,8 @@ double Potentials::update(const std::vector<std::vector<RHODTYPE>>& rho)
         = MPI_Allreduce(&dvdot, &sum, 1, MPI_DOUBLE, MPI_SUM, myPEenv.comm());
     if (rc != MPI_SUCCESS)
     {
-        std::cout << "MPI_Allreduce double sum failed!!!" << std::endl;
-        MPI_Abort(myPEenv.comm(), 2);
+        std::cerr << "MPI_Allreduce double sum failed!!!" << std::endl;
+        MPI_Abort(myPEenv.comm(), EXIT_FAILURE);
     }
     dvdot = sum;
 
@@ -253,8 +253,8 @@ double Potentials::delta_v(const std::vector<std::vector<RHODTYPE>>& rho)
         = MPI_Allreduce(&dvdot, &sum, 1, MPI_DOUBLE, MPI_SUM, myPEenv.comm());
     if (rc != MPI_SUCCESS)
     {
-        std::cout << "MPI_Allreduce double sum failed!!!" << std::endl;
-        MPI_Abort(myPEenv.comm(), 2);
+        std::cerr << "MPI_Allreduce double sum failed!!!" << std::endl;
+        MPI_Abort(myPEenv.comm(), EXIT_FAILURE);
     }
     dvdot = sum;
 
diff --git a/src/ProjectedMatricesSparse.cc b/src/ProjectedMatricesSparse.cc
index 8b328b1c..15ad6d6c 100644
--- a/src/ProjectedMatricesSparse.cc
+++ b/src/ProjectedMatricesSparse.cc
@@ -354,7 +354,7 @@ double ProjectedMatricesSparse::dotProductSimple(
               << std::endl;
 
     MGmol_MPI& mmpi = *(MGmol_MPI::instance());
-    MPI_Abort(mmpi.commSameSpin(), 0);
+    MPI_Abort(mmpi.commSameSpin(), EXIT_FAILURE);
 
     return -1.;
 }
diff --git a/src/main.cc b/src/main.cc
index 3fcbf791..3c6830a0 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -45,7 +45,7 @@ int main(int argc, char** argv)
     if (mpirc != MPI_SUCCESS)
     {
         std::cerr << "MPI Initialization failed!!!" << std::endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
     }
 
     MPI_Comm comm = MPI_COMM_WORLD;
diff --git a/src/md.cc b/src/md.cc
index dc2857eb..8ec20074 100644
--- a/src/md.cc
+++ b/src/md.cc
@@ -690,11 +690,10 @@ void MGmol<OrbitalsType>::loadRestartFile(const std::string filename)
     if (ierr < 0)
     {
         if (onpe0)
-            (*MPIdata::serr)
-                << "loadRestartFile: failed to read the restart file."
-                << std::endl;
+            std::cerr << "loadRestartFile: failed to read the restart file."
+                      << std::endl;
 
-        global_exit(0);
+        mmpi.abort();
     }
     if (!ct.fullyOccupied())
     {
diff --git a/src/mgmol_memory.cc b/src/mgmol_memory.cc
index a1360c99..b1be12d6 100644
--- a/src/mgmol_memory.cc
+++ b/src/mgmol_memory.cc
@@ -62,7 +62,7 @@ void addTrack(long addr, long asize)
     if (nPos > MAXNUMALLOCATIONS)
     {
         printf("ERROR: Not enough memory slots!!!");
-        MPI_Abort(MPI_COMM_WORLD, 1);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
     }
     // if(onpe0)printf("nPos=%d, addr=%ld, size=%ld\n",nPos,addr,asize);
 }
diff --git a/src/mgmol_run.cc b/src/mgmol_run.cc
index a5de1ad5..468d61bd 100644
--- a/src/mgmol_run.cc
+++ b/src/mgmol_run.cc
@@ -96,7 +96,7 @@ int mgmol_check()
     {
         std::cerr << "Code should be called with " << myPEenv.n_mpi_tasks()
                   << " MPI tasks only" << std::endl;
-        ct.global_exit(2);
+        ct.global_exit();
     }
 
     assert(ct.getMGlevels() >= -1);
diff --git a/src/pb/Lap.h b/src/pb/Lap.h
index 33d90706..460e36c1 100644
--- a/src/pb/Lap.h
+++ b/src/pb/Lap.h
@@ -35,7 +35,7 @@ class Lap : public FDoper<T>
     virtual void applyWithPot(GridFunc<T>&, const double* const, T*)
     {
         std::cerr << "ERROR: Lap::applyWithPot() not implemented" << std::endl;
-        MPI_Abort(MPI_COMM_WORLD, 0);
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
     }
 
     std::string name() const { return name_; }
diff --git a/src/pb/PEenv.cc b/src/pb/PEenv.cc
index d5ff78f3..3e2fb777 100644
--- a/src/pb/PEenv.cc
+++ b/src/pb/PEenv.cc
@@ -197,7 +197,7 @@ PEenv::~PEenv()
         if (mpirc != MPI_SUCCESS)
         {
             std::cerr << "MPI_Comm_free failed!" << std::endl;
-            MPI_Abort(comm_, 2);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
     }
     if (cart_comm_ != MPI_COMM_NULL) MPI_Comm_free(&cart_comm_);
@@ -277,7 +277,7 @@ void PEenv::task2xyz()
         if (rc != MPI_SUCCESS)
         {
             std::cerr << " error in MPI_Cart_coords()!!!" << std::endl;
-            MPI_Abort(comm_, 1);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
 #else
         mytask_dir_[2] = mytask_ % n_mpi_tasks_dir_[2];
@@ -650,7 +650,7 @@ void PEenv::split_comm(const int nx, const int ny, const int nz, const int bias)
         {
             std::cerr << "MPI_Comm_split failed!, my color_=" << color_
                       << std::endl;
-            MPI_Abort(comm_, 0);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
         MPI_Comm_size(comm_active_, &n_mpi_tasks_);
 #ifndef NDEBUG
@@ -696,7 +696,7 @@ void PEenv::printPEnames(std::ostream& os) const
                 {
                     std::cerr << "PEenv::printPEnames, MPI_Recv() failed!!!"
                               << std::endl;
-                    MPI_Abort(comm_, 0);
+                    MPI_Abort(comm_, EXIT_FAILURE);
                 }
             }
             else if (ip == mytask_)
@@ -708,7 +708,7 @@ void PEenv::printPEnames(std::ostream& os) const
                 {
                     std::cerr << "PEenv::printPEnames, MPI_Send() failed!!!"
                               << std::endl;
-                    MPI_Abort(comm_, 0);
+                    MPI_Abort(comm_, EXIT_FAILURE);
                 }
             }
             if (mytask_ == 0)
@@ -717,7 +717,7 @@ void PEenv::printPEnames(std::ostream& os) const
     if (mytask_ == 0) os << std::endl;
 }
 
-void PEenv::globalExit() const { MPI_Abort(comm_, 2); }
+void PEenv::globalExit() const { MPI_Abort(comm_, EXIT_FAILURE); }
 
 void PEenv::bcast(int* val, const int n) const
 {
diff --git a/src/pb/PEenv.h b/src/pb/PEenv.h
index bc4751a5..9782ddb9 100644
--- a/src/pb/PEenv.h
+++ b/src/pb/PEenv.h
@@ -166,7 +166,7 @@ class PEenv
         {
             std::cerr << "ERROR in PEenv::maxXdir()" << std::endl;
             sleep(5);
-            MPI_Abort(comm_, 0);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
         delete[] sendbuf;
     }
@@ -181,7 +181,7 @@ class PEenv
         {
             std::cerr << "ERROR in PEenv::maxYdir()" << std::endl;
             sleep(5);
-            MPI_Abort(comm_, 0);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
         delete[] sendbuf;
     }
@@ -196,7 +196,7 @@ class PEenv
         {
             std::cerr << "ERROR in PEenv::maxZdir()" << std::endl;
             sleep(5);
-            MPI_Abort(comm_, 0);
+            MPI_Abort(comm_, EXIT_FAILURE);
         }
         delete[] sendbuf;
     }
diff --git a/src/radial/RadialMeshFunction.cc b/src/radial/RadialMeshFunction.cc
index 499e482a..79b32518 100644
--- a/src/radial/RadialMeshFunction.cc
+++ b/src/radial/RadialMeshFunction.cc
@@ -98,7 +98,7 @@ void RadialMeshFunction::bcast(MPI_Comm comm, const int root)
     {
         (*MPIdata::sout) << "RadialMeshFunction::bcast() failed!!!"
                          << std::endl;
-        MPI_Abort(comm, 0);
+        MPI_Abort(comm, EXIT_FAILURE);
     }
 
     for (int i = 0; i < nn[1]; i++)
@@ -110,7 +110,7 @@ void RadialMeshFunction::bcast(MPI_Comm comm, const int root)
         {
             (*MPIdata::sout)
                 << "RadialMeshFunction::bcast() failed!!!" << std::endl;
-            MPI_Abort(comm, 0);
+            MPI_Abort(comm, EXIT_FAILURE);
         }
     }
 }
diff --git a/src/setup.cc b/src/setup.cc
index 9963bfc5..2ff6d79e 100644
--- a/src/setup.cc
+++ b/src/setup.cc
@@ -140,7 +140,7 @@ int MGmol<OrbitalsType>::setupLRsFromInput(const std::string filename)
         if (!tfile->is_open())
         {
             std::cerr << " Unable to open file " << filename << std::endl;
-            global_exit(0);
+            mmpi.abort();
         }
         else
         {
@@ -173,7 +173,7 @@ int MGmol<OrbitalsType>::setupConstraintsFromInput(const std::string filename)
         if (!tfile->is_open())
         {
             std::cerr << " Unable to open file " << filename << std::endl;
-            global_exit(0);
+            mmpi.abort();
         }
         else
         {
diff --git a/src/sparse_linear_algebra/DataDistribution.cc b/src/sparse_linear_algebra/DataDistribution.cc
index d4b26d93..67bb1319 100644
--- a/src/sparse_linear_algebra/DataDistribution.cc
+++ b/src/sparse_linear_algebra/DataDistribution.cc
@@ -288,7 +288,7 @@ void DataDistribution::distributeLocalDataWithCommOvlp(const int nsteps,
             std::cout << "ERROR: " << name_ << ", dir=" << dir
                       << ", remote_size=" << remote_size << ", bsiz=" << bsiz
                       << std::endl;
-            MPI_Abort(cart_comm_, 0);
+            MPI_Abort(cart_comm_, EXIT_FAILURE);
         }
         // string stamp="DataDistribution ("+name_+"), buffer size checked...";
         // printWithTimeStamp(stamp,cout);
@@ -302,14 +302,14 @@ void DataDistribution::distributeLocalDataWithCommOvlp(const int nsteps,
         if (mpircv != MPI_SUCCESS)
         {
             std::cout << "ERROR in MPI_Irecv, code=" << mpircv << std::endl;
-            MPI_Abort(cart_comm_, 0);
+            MPI_Abort(cart_comm_, EXIT_FAILURE);
         }
         int mpisnd = MPI_Isend(packed_buffer.sendBuffer(), siz, MPI_CHAR, dest,
             0, cart_comm_, &request[1]);
         if (mpisnd != MPI_SUCCESS)
         {
             std::cout << "ERROR in MPI_Isend, code=" << mpisnd << std::endl;
-            MPI_Abort(cart_comm_, 0);
+            MPI_Abort(cart_comm_, EXIT_FAILURE);
         }
         /* wait to complete communication */
         MPI_Waitall(2, request, MPI_STATUSES_IGNORE);
diff --git a/src/tools.cc b/src/tools.cc
index 95790c59..aff34933 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -29,7 +29,7 @@ void noMoreMemory()
     std::cerr << "Unable to satisfy request for memory for MPI task " << mype
               << std::endl;
     Control& ct = *(Control::instance());
-    ct.global_exit(3);
+    ct.global_exit();
 }
 
 // an atom name should start with a capital letter and end with a number
@@ -229,12 +229,12 @@ void printWithTimeStamp(const std::string& string2print, std::ostream& os)
     if( mpierr!=MPI_SUCCESS )
     {
         cerr << " Error in MPI!!!" << std::endl;
-        MPI_Abort(mmpi.commGlobal(),1);
+        MPI_Abort(mmpi.commGlobal(),EXIT_FAILURE);
     }
     if( r!=mmpi.size()*s && onpe0 )
     {
         cerr << " Error in barrier: "<<r<<"!="<<(mmpi.size()*s)<<endl;
-        MPI_Abort(mmpi.commGlobal(),1);
+        MPI_Abort(mmpi.commGlobal(),EXIT_FAILURE);
     }
     s++;
     s=(s%128);
diff --git a/src/tools/MGmol_MPI.cc b/src/tools/MGmol_MPI.cc
index 7e0d2a23..d21d5840 100644
--- a/src/tools/MGmol_MPI.cc
+++ b/src/tools/MGmol_MPI.cc
@@ -110,7 +110,7 @@ void MGmol_MPI::setupComm(
                     << " Calculation with spin requires even number of MPI "
                        "tasks!!!"
                     << std::endl;
-                MPI_Abort(comm, 1);
+                MPI_Abort(comm, EXIT_FAILURE);
             }
 
             // create communicator to communicate data within one spin
@@ -125,7 +125,7 @@ void MGmol_MPI::setupComm(
             {
                 std::cerr << " Error in creating spin subcommunicator!!!"
                           << std::endl;
-                MPI_Abort(comm, 1);
+                MPI_Abort(comm, EXIT_FAILURE);
             }
 
             MPI_Barrier(comm_global_);
@@ -141,7 +141,7 @@ void MGmol_MPI::setupComm(
             {
                 std::cerr << " Error in creating across spin subcommunicator!!!"
                           << std::endl;
-                MPI_Abort(comm, 1);
+                MPI_Abort(comm, EXIT_FAILURE);
             }
             nspin_  = 2;
             myspin_ = key;
diff --git a/src/tools/MGmol_MPI.h b/src/tools/MGmol_MPI.h
index 55b32844..c69bf36d 100644
--- a/src/tools/MGmol_MPI.h
+++ b/src/tools/MGmol_MPI.h
@@ -237,7 +237,7 @@ class MGmol_MPI
     void split_allreduce_sums_int(int*, const int);
     void split_allreduce_sums_short(short int*, const int);
 
-    void abort() const { MPI_Abort(comm_global_, 0); }
+    void abort() const { MPI_Abort(comm_global_, EXIT_FAILURE); }
 };
 
 #endif
diff --git a/src/tools/Vector3D.cc b/src/tools/Vector3D.cc
index 445f8787..2fe9a0e4 100644
--- a/src/tools/Vector3D.cc
+++ b/src/tools/Vector3D.cc
@@ -80,7 +80,7 @@ void bcastvv3d(std::vector<Vector3D>& vv, MPI_Comm comm)
         std::cerr
             << "ERROR!!!! bcastvv3d(), Failure in MPI_Bcast of 'radii_'!!!"
             << std::endl;
-        MPI_Abort(comm, 0);
+        MPI_Abort(comm, EXIT_FAILURE);
     }
     for (int j = 0; j < n; j++)
         for (short i = 0; i < 3; i++)