diff --git a/common/api/api_plugin_manager.cpp b/common/api/api_plugin_manager.cpp
index e6e3f1bf01..e31964b78a 100644
--- a/common/api/api_plugin_manager.cpp
+++ b/common/api/api_plugin_manager.cpp
@@ -290,7 +290,7 @@ void API_PLUGIN_MANAGER::InvokeAction( const wxString& aIdentifier )
                     if( !aError.IsEmpty() )
                         wxLogTrace( traceApi, wxString::Format( "Manager: action stderr: %s", aError ) );
                 },
-                &env );
+                &env, true );
 
         break;
     }
diff --git a/common/api/api_server.cpp b/common/api/api_server.cpp
index 7642738722..0d02ce0b1f 100644
--- a/common/api/api_server.cpp
+++ b/common/api/api_server.cpp
@@ -87,11 +87,11 @@ void KICAD_API_SERVER::Start()
         return;
     }
 
-    if( socket.FileExists() )
+    if( socket.Exists() )
     {
-        socket.SetFullName( wxString::Format( wxS( "api-%ul.sock" ), ::wxGetProcessId() ) );
+        socket.SetFullName( wxString::Format( wxS( "api-%lu.sock" ), ::wxGetProcessId() ) );
 
-        if( socket.FileExists() )
+        if( socket.Exists() )
         {
             wxLogTrace( traceApi, wxString::Format( "Server: PID socket path %s already exists!",
                                                     socket.GetFullPath() ) );
@@ -210,6 +210,8 @@ void KICAD_API_SERVER::handleApiEvent( wxCommandEvent& aEvent )
 
         if( ADVANCED_CFG::GetCfg().m_EnableAPILogging )
             log( "Response (ERROR): " + error.Utf8DebugString() );
+
+        return;
     }
 
     API_RESULT result;