diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 705b60e..2f540c2 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -423,7 +423,7 @@
 	vty_bind_free(vbind);
 	bind = gprs_ns2_bind_by_name(vty_nsi, name);
 	if (bind)
-		bind->driver->free_bind(bind);
+		gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
@@ -678,7 +678,7 @@
 		return CMD_ERR_NOTHING_TODO;
 
 	OSMO_ASSERT(bind->ll == GPRS_NS2_LL_UDP);
-	bind->driver->free_bind(bind);
+	gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
@@ -939,7 +939,7 @@
 		return CMD_WARNING;
 	}
 
-	bind->driver->free_bind(bind);
+	gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty
index 4589f96..458e2c8 100644
--- a/tests/gb/gprs_ns2_vty.vty
+++ b/tests/gb/gprs_ns2_vty.vty
@@ -83,3 +83,7 @@
 OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222
 Specified SNS endpoint already part of the NSE.
 OsmoNSdummy(config-ns-nse)# exit
+OsmoNSdummy(config-ns)# no bind abc
+OsmoNSdummy(config-ns)# no bind abc77
+bind abc77 does not exist!
+OsmoNSdummy(config-ns)# exit