diff --git a/plugins/base_capability.go b/plugins/base_capability.go
index 140fadd7f..7a67b1460 100644
--- a/plugins/base_capability.go
+++ b/plugins/base_capability.go
@@ -78,10 +78,6 @@ type wasmPlugin[S any] interface {
 	getMetrics() metrics.Metrics
 }
 
-type errorMapper interface {
-	mapError(err error) error
-}
-
 func callMethod[S any, R any](ctx context.Context, wp WasmPlugin, methodName string, fn func(inst S) (R, error)) (R, error) {
 	// Add a unique call ID to the context for tracing
 	ctx = log.NewContext(ctx, "callID", id.NewRandom())
@@ -102,10 +98,6 @@ func callMethod[S any, R any](ctx context.Context, wp WasmPlugin, methodName str
 	r, err = checkErr(fn(inst))
 	elapsed := time.Since(start)
 
-	if em, ok := any(p).(errorMapper); ok {
-		err = em.mapError(err)
-	}
-
 	if !errors.Is(err, api.ErrNotImplemented) {
 		id := p.PluginID()
 		isOk := err == nil
diff --git a/plugins/plugin_lifecycle_manager.go b/plugins/plugin_lifecycle_manager.go
index 36d215af4..e00e7e5f3 100644
--- a/plugins/plugin_lifecycle_manager.go
+++ b/plugins/plugin_lifecycle_manager.go
@@ -82,7 +82,7 @@ func (m *pluginLifecycleManager) callOnInit(plugin *plugin) error {
 	// Call OnInit
 	callStart := time.Now()
 	_, err = checkErr(initPlugin.OnInit(ctx, req))
-	m.metrics.RecordPluginRequest(ctx, plugin.ID, "OnInit", err != nil, time.Since(callStart).Milliseconds())
+	m.metrics.RecordPluginRequest(ctx, plugin.ID, "OnInit", err == nil, time.Since(callStart).Milliseconds())
 	if err != nil {
 		log.Error("Error initializing plugin", "plugin", plugin.ID, "elapsed", time.Since(start), err)
 		return err