@@ -211,7 +211,7 @@ func loadWithRetry(name string, retry bool) (*Plugin, error) {

 	}

 	var retries int

 	for {

-		pl, err := registry.Plugin(name)

+		plugin, err := registry.Plugin(name)

 		if err != nil {

 			if !retry {

 				return nil, err

@@ -232,17 +232,17 @@ func loadWithRetry(name string, retry bool) (*Plugin, error) {

 			storage.Unlock()

 			return pl, pl.activate()

 		}

-		storage.plugins[name] = pl

+		storage.plugins[name] = plugin

 		storage.Unlock()

-		err = pl.activate()

+		err = plugin.activate()

 		if err != nil {

 			storage.Lock()

 			delete(storage.plugins, name)

 			storage.Unlock()

 		}

-		return pl, err

+		return plugin, err

 	}

 }