diff --git a/src/flb_input_thread.c b/src/flb_input_thread.c
index 2091f9b47fe..64313ce1678 100644
--- a/src/flb_input_thread.c
+++ b/src/flb_input_thread.c
@@ -620,9 +620,11 @@ int flb_input_thread_instance_init(struct flb_config *config, struct flb_input_i
     ret = input_thread_instance_get_status(ins);
     if (ret == -1) {
         flb_plg_error(ins, "unexpected error loading plugin instance");
+        return -1;
     }
     else if (ret == FLB_FALSE) {
         flb_plg_error(ins, "could not initialize threaded plugin instance");
+        return -1;
     }
     else if (ret == FLB_TRUE) {
         flb_plg_info(ins, "thread instance initialized");
diff --git a/src/proxy/go/go.c b/src/proxy/go/go.c
index 540005a8d9d..b1842f93329 100644
--- a/src/proxy/go/go.c
+++ b/src/proxy/go/go.c
@@ -224,7 +224,6 @@ int proxy_go_input_init(struct flb_plugin_proxy *proxy)
     if (ret <= 0) {
         flb_error("[go proxy]: plugin '%s' failed to initialize",
                   plugin->name);
-        flb_free(plugin);
         return -1;
     }