diff --git a/cli/headlessmanager.cpp b/cli/headlessmanager.cpp
index bc6693b..53346f5 100644
--- a/cli/headlessmanager.cpp
+++ b/cli/headlessmanager.cpp
@@ -51,6 +51,7 @@ HeadlessManager::HeadlessManager(QObject *obj_parent) :
 HeadlessManager::~HeadlessManager()
 {
     VitaMTP_Cleanup();
+    VitaMTP_USB_Exit();
     delete m_db;
 }
 
@@ -69,8 +70,10 @@ void HeadlessManager::refreshDatabase()
 
 void HeadlessManager::start()
 {
-    if(VitaMTP_Init() < 0) {
-        qCritical("Cannot initialize VitaMTP library");
+    VitaMTP_Init();
+
+    if(VitaMTP_USB_Init() < 0) {
+        emit messageSent(tr("Cannot initialize VitaMTP USB library"));
         return;
     }
 
diff --git a/gui/clientmanager.cpp b/gui/clientmanager.cpp
index 4d50aca..d6acbd1 100644
--- a/gui/clientmanager.cpp
+++ b/gui/clientmanager.cpp
@@ -54,6 +54,7 @@ ClientManager::ClientManager(Database *db, QObject *obj_parent) :
 ClientManager::~ClientManager()
 {
     VitaMTP_Cleanup();
+    VitaMTP_USB_Exit();
 }
 
 void ClientManager::databaseUpdated(int count)
@@ -76,8 +77,10 @@ void ClientManager::showPinDialog(QString name, int pin)
 
 void ClientManager::start()
 {
-    if(VitaMTP_Init() < 0) {
-        emit messageSent(tr("Cannot initialize VitaMTP library"));
+    VitaMTP_Init();
+
+    if(VitaMTP_USB_Init() < 0) {
+        emit messageSent(tr("Cannot initialize VitaMTP USB library"));
         return;
     }