diff --git a/cluster/network.go b/cluster/network.go
index ca02a2f1d6..e7b2a5fa3b 100644
--- a/cluster/network.go
+++ b/cluster/network.go
@@ -67,20 +67,21 @@ func (networks Networks) Get(IDOrName string) *Network {
 
 	candidates := []*Network{}
 
-	// Match name, /name or engine/name.
+	// Match name or engine/name.
 	for _, network := range networks {
 		if network.Name == IDOrName || network.Engine.ID+"/"+network.Name == IDOrName || network.Engine.Name+"/"+network.Name == IDOrName {
 			candidates = append(candidates, network)
 		}
 	}
 
+	// Return if we found a unique match.
 	if size := len(candidates); size == 1 {
 		return candidates[0]
 	} else if size > 1 {
 		return nil
 	}
 
-	// Match name, /name or engine/name.
+	// Match /name and return as soon as we find one.
 	for _, network := range networks {
 		if network.Name == "/"+IDOrName {
 			return network
diff --git a/cluster/volume.go b/cluster/volume.go
index 394d097bf6..ecf832b59e 100644
--- a/cluster/volume.go
+++ b/cluster/volume.go
@@ -21,20 +21,21 @@ func (volumes Volumes) Get(name string) *Volume {
 
 	candidates := []*Volume{}
 
-	// Match name, /name or engine/name.
+	// Match name or engine/name.
 	for _, volume := range volumes {
 		if volume.Name == name || volume.Engine.ID+"/"+volume.Name == name || volume.Engine.Name+"/"+volume.Name == name {
 			candidates = append(candidates, volume)
 		}
 	}
 
+	// Return if we found a unique match.
 	if size := len(candidates); size == 1 {
 		return candidates[0]
 	} else if size > 1 {
 		return nil
 	}
 
-	// Match name, /name or engine/name.
+	// Match /name and return as soon as we find one.
 	for _, volume := range volumes {
 		if volume.Name == "/"+name {
 			return volume