diff --git a/tool/CommandDownload.cpp b/tool/CommandDownload.cpp
index b69ef094..0b468eac 100644
--- a/tool/CommandDownload.cpp
+++ b/tool/CommandDownload.cpp
@@ -1,8 +1,6 @@
 /*****************************************************************************
  *
- *  $Id$
- *
- *  Copyright (C) 2006-2009  Florian Pose, Ingenieurgemeinschaft IgH
+ *  Copyright (C) 2006-2022  Florian Pose, Ingenieurgemeinschaft IgH
  *
  *  This file is part of the IgH EtherCAT Master.
  *
@@ -184,8 +182,7 @@ void CommandDownload::execute(const StringVector &args)
             throwCommandException(e.what());
         } catch (ios::failure &e) {
             delete [] sdo_data;
-            err << "Invalid value argument '" << args[2]
-                << "' for type '" << dataType->name << "'!";
+            err << "Invalid value for type '" << dataType->name << "'!";
             throwInvalidUsageException(err);
         }
 
@@ -207,7 +204,7 @@ void CommandDownload::execute(const StringVector &args)
             throwCommandException(e.what());
         } catch (ios::failure &e) {
             delete [] sdo_data;
-            err << "Invalid value argument '" << args[2]
+            err << "Invalid value argument '" << args[valueIndex]
                 << "' for type '" << dataType->name << "'!";
             throwInvalidUsageException(err);
         }