diff --git a/src/vpp-api/vom/connection.cpp b/src/vpp-api/vom/connection.cpp
index 90c02f9..c03ef99 100644
--- a/src/vpp-api/vom/connection.cpp
+++ b/src/vpp-api/vom/connection.cpp
@@ -26,7 +26,6 @@
 
 connection::~connection()
 {
-  disconnect();
 }
 
 void
@@ -35,16 +34,15 @@
   m_vapi_conn->disconnect();
 }
 
-void
+int
 connection::connect()
 {
   vapi_error_e rv;
 
-  do {
-    rv = m_vapi_conn->connect(m_app_name.c_str(),
-                              NULL, // m_api_prefix.c_str(),
-                              128, 128);
-  } while (VAPI_OK != rv);
+  rv = m_vapi_conn->connect(m_app_name.c_str(),
+                            NULL, // m_api_prefix.c_str(),
+                            128, 128);
+  return rv;
 }
 
 vapi::Connection&