--- a/tool/CommandSoeWrite.cpp	Fri Mar 19 13:27:08 2010 +0100
+++ b/tool/CommandSoeWrite.cpp	Thu Apr 29 14:05:15 2010 +0200
@@ -28,7 +28,6 @@
  ****************************************************************************/
 
 #include <iostream>
-#include <iomanip>
 using namespace std;
 
 #include "CommandSoeWrite.h"
@@ -148,8 +147,7 @@
         m.writeSoe(&ioctl);
     } catch (MasterDeviceSoeException &e) {
         delete [] ioctl.data;
-        err << "SoE write command aborted with code 0x"
-            << setfill('0') << hex << setw(4) << e.errorCode << ".";
+        err << "SoE write command failed with code " << errorMsg(e.errorCode);
         throwCommandException(err);
     } catch (MasterDeviceException &e) {
         delete [] ioctl.data;