diff --git a/mediachanger/acs/AcsCmdLine.cpp b/mediachanger/acs/AcsCmdLine.cpp
index 2bb552d038ee2e3f6803dfba8d7379bb3a0a53a6..342cd3a10cffbd926bdd79c31884921e3202d423 100644
--- a/mediachanger/acs/AcsCmdLine.cpp
+++ b/mediachanger/acs/AcsCmdLine.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "AcsCmdLine.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 
 #include <stdlib.h>
@@ -170,7 +169,7 @@ void cta::mediachanger::acs::AcsCmdLine::handleMissingParameter(const int opt) {
 // handleUnknownOption
 //------------------------------------------------------------------------------
 void cta::mediachanger::acs::AcsCmdLine::handleUnknownOption(const int opt) {
-  cta::exception::InvalidArgument ex;
+  UnknownOption ex;
   if(0 == optopt) {
     ex.getMessage() << "Unknown command-line option";
   } else {
diff --git a/mediachanger/acs/AcsCmdLine.hpp b/mediachanger/acs/AcsCmdLine.hpp
index b625e3c388d3d3ae694e463f659c208b4d0c0d4a..7f806d4cf3cfeb5f99831aeb4c81e975991b0ab7 100644
--- a/mediachanger/acs/AcsCmdLine.hpp
+++ b/mediachanger/acs/AcsCmdLine.hpp
@@ -96,10 +96,19 @@ protected:
    */
   void handleMissingParameter(const int opt);
 
+  /**
+   * Unkown option.
+   */
+  struct UnknownOption: public exception::Exception {
+    UnknownOption(const std::string &context = "", const bool embedBacktrace = true):
+      cta::exception::Exception(context, embedBacktrace) {}
+  };
+
   /**
    * Handles the specified unknown option.
    *
    * @param opt The option.
+   * @throw UnknownOption indepedent of the value of opt.
    */
   void handleUnknownOption(const int opt);