diff --git a/mediachanger/acs/AcsQueryDriveCmd.cpp b/mediachanger/acs/AcsQueryDriveCmd.cpp
index 5aa5985b072070c931f7e7416ff6098775db6c6c..a3150c9fe5e3305518c919f66369199377eb7aa0 100644
--- a/mediachanger/acs/AcsQueryDriveCmd.cpp
+++ b/mediachanger/acs/AcsQueryDriveCmd.cpp
@@ -19,7 +19,6 @@
 
 #include "AcsQueryDriveCmd.hpp"
 #include "AcsQueryDriveCmdLine.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
 #include <getopt.h>
 #include <iostream>
 #include <string.h>
@@ -84,11 +83,11 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::syncQueryDrive() {
     requestResponsesUntilFinal(requestSeqNumber, buf, m_cmdLine.queryInterval,
       m_cmdLine.timeout);
     processQueryResponse(m_out, buf);
-  } catch(cta::exception::Exception &ex) {
-    cta::exception::QueryVolumeFailed qf;
-    qf.getMessage() << "Failed to query drive " <<
-      m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) << ": " << ex.getMessage().str();
-    throw qf;
+  } catch(cta::exception::Exception &ne) {
+    cta::exception::Exception ex;
+    ex.getMessage() << "Failed to query drive " <<
+      m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) << ": " << ne.getMessage().str();
+    throw ex;
   }
 }
 
@@ -103,7 +102,7 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::sendQueryDriveRequest(
   m_dbg << "Acs::queryDrive() returned " << acs_status(s) << std::endl;
 
   if(STATUS_SUCCESS != s) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Failed to send query request for drive " <<
      m_acs.driveId2Str(m_cmdLine.libraryDriveSlot)<< ": " << acs_status(s);
     throw ex;
@@ -120,14 +119,14 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::processQueryResponse(
   const ACS_QUERY_DRV_RESPONSE *const msg = (ACS_QUERY_DRV_RESPONSE *)buf;
 
   if(STATUS_SUCCESS != msg->query_drv_status) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Status of query response is not success: " <<
       acs_status(msg->query_drv_status);
     throw ex;
   }
 
   if((unsigned short)1 != msg->count) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Query response does not contain a single drive: count="
       << msg->count;
     throw ex;
@@ -137,7 +136,7 @@ void cta::mediachanger::acs::AcsQueryDriveCmd::processQueryResponse(
   const QU_DRV_STATUS &drvStatus = msg->drv_status[0];
 
   if(m_acs.driveId2Str(m_cmdLine.libraryDriveSlot)!= m_acs.driveId2Str(drvStatus.drive_id)) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() <<
       "Drive identifier of query response does not match that of request"
       " requestDriveID=" <<m_acs.driveId2Str(m_cmdLine.libraryDriveSlot) <<
diff --git a/mediachanger/acs/AcsQueryVolumeCmd.cpp b/mediachanger/acs/AcsQueryVolumeCmd.cpp
index 68ad5de8b2ec6e07a0e0189203a00c2033d08920..9384ed51942d0c1da4f4a3f0211fe764b12c6759 100644
--- a/mediachanger/acs/AcsQueryVolumeCmd.cpp
+++ b/mediachanger/acs/AcsQueryVolumeCmd.cpp
@@ -19,7 +19,6 @@
 
 #include "AcsQueryVolumeCmd.hpp"
 #include "AcsQueryVolumeCmdLine.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
 #include <getopt.h>
 #include <iostream>
 #include <string.h>
@@ -84,11 +83,11 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::syncQueryVolume() {
     requestResponsesUntilFinal(requestSeqNumber, buf, m_cmdLine.queryInterval,
       m_cmdLine.timeout);
     processQueryResponse(m_out, buf);
-  } catch(cta::exception::Exception &ex) {
-    cta::exception::QueryVolumeFailed qf;
-    qf.getMessage() << "Failed to query volume " <<
-      m_cmdLine.volId.external_label << ": " << ex.getMessage().str();
-    throw qf;
+  } catch(cta::exception::Exception &ne) {
+    cta::exception::Exception ex;
+    ex.getMessage() << "Failed to query volume " <<
+      m_cmdLine.volId.external_label << ": " << ne.getMessage().str();
+    throw ex;
   }
 }
 
@@ -109,7 +108,7 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::sendQueryVolumeRequest(
   m_dbg << "Acs::queryVolume() returned " << acs_status(s) << std::endl;
 
   if(STATUS_SUCCESS != s) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Failed to send query request for volume " <<
       m_cmdLine.volId.external_label << ": " << acs_status(s);
     throw ex;
@@ -126,14 +125,14 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::processQueryResponse(
   const ACS_QUERY_VOL_RESPONSE *const msg = (ACS_QUERY_VOL_RESPONSE *)buf;
 
   if(STATUS_SUCCESS != msg->query_vol_status) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Status of query response is not success: " <<
       acs_status(msg->query_vol_status);
     throw ex;
   }
 
   if((unsigned short)1 != msg->count) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() << "Query response does not contain a single volume: count="
       << msg->count;
     throw ex;
@@ -143,7 +142,7 @@ void cta::mediachanger::acs::AcsQueryVolumeCmd::processQueryResponse(
   const QU_VOL_STATUS &volStatus = msg->vol_status[0];
 
   if(strcmp(m_cmdLine.volId.external_label, volStatus.vol_id.external_label)) {
-    cta::exception::QueryVolumeFailed ex;
+    cta::exception::Exception ex;
     ex.getMessage() <<
       "Volume identifier of query response does not match that of request"
       ": requestVID=" << m_cmdLine.volId.external_label <<
diff --git a/mediachanger/acs/AcsQueryVolumeCmd.hpp b/mediachanger/acs/AcsQueryVolumeCmd.hpp
index dda0aa48246c98f51b4d5644490957e9bc03082e..6c83558ba5d7fea33197d754b77515646a30265c 100644
--- a/mediachanger/acs/AcsQueryVolumeCmd.hpp
+++ b/mediachanger/acs/AcsQueryVolumeCmd.hpp
@@ -21,7 +21,6 @@
 #include "AcsCmd.hpp"
 #include "AcsQueryVolumeCmdLine.hpp"
 #include "common/exception/MissingOperand.hpp"
-#include "common/exception/QueryVolumeFailed.hpp"
 
 
 #include <stdint.h>
diff --git a/mediachanger/acs/CMakeLists.txt b/mediachanger/acs/CMakeLists.txt
index cd10186f6c34077899766536dfbcc587dfb77122..20aa23f3a0e4b61a8ed4126eb5ad2fa81d60bd5c 100644
--- a/mediachanger/acs/CMakeLists.txt
+++ b/mediachanger/acs/CMakeLists.txt
@@ -128,7 +128,6 @@ set (ACS_QUERYVOLUME_SRC_FILES
   ../../common/exception/Exception.cpp
   ../../common/exception/Mismatch.cpp
   ../../common/exception/MissingOperand.cpp
-  ../../common/exception/QueryVolumeFailed.cpp
   ../../common/exception/RequestFailed.cpp
   Acs.cpp
   AcsCmd.cpp
@@ -159,7 +158,6 @@ set (ACS_QUERYDRIVE_SRC_FILES
   ../../common/exception/Exception.cpp
   ../../common/exception/Mismatch.cpp
   ../../common/exception/MissingOperand.cpp
-  ../../common/exception/QueryVolumeFailed.cpp
   ../../common/exception/RequestFailed.cpp
   Acs.cpp
   AcsCmd.cpp