diff --git a/include/gepetto/viewer/corba/api.hh b/include/gepetto/viewer/corba/api.hh
index 16e8de076dcbb9e920f1ade3d46b343c29916a0f..6b2a600865020b938574b33c3091ed75c0f3b1cf 100644
--- a/include/gepetto/viewer/corba/api.hh
+++ b/include/gepetto/viewer/corba/api.hh
@@ -8,14 +8,14 @@ namespace viewer {
 namespace corba {
 
 #if __cplusplus >= 201103L
-void applyConfiguration(const char* name, corbaserver::Transform&& t)
+inline void applyConfiguration(const char* name, corbaserver::Transform&& t)
 {
   if (!connected()) return;
   gui()->applyConfiguration(name, t);
 }
 #endif // __cplusplus > 201103L
 
-void refresh()
+inline void refresh()
 {
   if (!connected()) return;
   gui()->refresh();
diff --git a/include/gepetto/viewer/corba/client.hh b/include/gepetto/viewer/corba/client.hh
index 7caf2c310aa67f1ea0019bda7004ba5f753a1253..4e53a9642ce82a1217b3857b1c17b0cf4f6f8d27 100644
--- a/include/gepetto/viewer/corba/client.hh
+++ b/include/gepetto/viewer/corba/client.hh
@@ -53,7 +53,7 @@ namespace corba {
   corbaserver::GraphicalInterface_var& gui ();
 
   /// Tells whether the connection to the gui is ok.
-  bool connected ()
+  inline bool connected ()
   {
     return !CORBA::is_nil(gui());
   }
@@ -64,7 +64,7 @@ namespace corba {
   /// \param url if NULL, url is initialized with \c host and \c port.
   /// \param host, port if not NULL, url is set to = "corbaloc:iiop:host:port"
   /// \return a client to the GUI.
-  corbaserver::GraphicalInterface_var& gui (const char* windowName,
+  inline corbaserver::GraphicalInterface_var& gui (const char* windowName,
       bool dontRaise = false, const char* url = NULL,
       const char* host = "localhost", const int port = 12321)
   {
diff --git a/src/client.cc b/src/client.cc
index e2b849890188d31824da9c6d496f89cfdf7f25cd..44f074a1644b142b04e5edca7264f3aa8ff2c294 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -110,6 +110,8 @@ namespace gepetto {
           if (windowName) client.gui()->createWindow(windowName);
         } catch (const std::runtime_error&) {
           if (!dontRaise) throw;
+        } catch (const CORBA::Exception&) {
+          if (!dontRaise) throw;
         }
       }
     }