Merge branch 'master' of github.com:simgrid/simgrid

diff --combined src/s4u/s4u_engine.cpp
index 8df13cd,71a2345..e061713
--- 1/src/s4u/s4u_engine.cpp
--- 2/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@@ -35,7 -35,7 +35,7 @@@ Engine::Engine(int *argc, char **argv) 
    s4u::Engine::instance_ = this;
    pimpl                  = new kernel::EngineImpl();
  
-   TRACE_global_init(argc, argv);
+   TRACE_global_init();
    SIMIX_global_init(argc, argv);
  }
  
@@@ -128,11 -128,9 +128,11 @@@ NetZone* Engine::getNetzoneByNameOrNull
  /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
  simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(const char* name)
  {
 -  if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
 +  try {
 +    return pimpl->netpoints_.at(name);
 +  } catch (std::out_of_range& unfound) {
      return nullptr;
 -  return pimpl->netpoints_.at(name);
 +  }
  }
  /** @brief Fill the provided vector with all existing netpoints */
  void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)