diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
index 9237eac957c3c01d49c5e999fc1e81d1339532ce..3dac6f317a43e00b8c1bb7d74b01944e0f20c9c1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
@@ -103,7 +103,9 @@ last() : return "tata"
         }
       else
         {
-          itkGenericExceptionMacro( "Invalid key "<<val<<". Must be in lowercase, containing alphanumerical characters or \".\"");
+            itkGenericExceptionMacro( "Invalid key '"
+                                      << val <<
+                                      "'. Must be in lowercase, containing alphanumerical characters or \".\"");
         }
     }
 
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx
index b07f6685930dee7b2fa7b5b209767ceb4dc5255b..eb2b09ac2ca54bdc8c3aeac3697b59baa895ffce 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx
@@ -31,7 +31,6 @@ ChoiceParameter::~ChoiceParameter()
 {
 }
 
-
 void
 ChoiceParameter::AddChoice( std::string choicekey, std::string choiceName )
 {
@@ -117,7 +116,7 @@ ChoiceParameter::GetChoiceParameterGroupByKey( std::string choiceKey )
       }
     }
 
-  itkExceptionMacro(<< "Cannot find " << choiceKey);
+  itkExceptionMacro(<< "Cannot find choice key: '" << choiceKey  << "'");
 }
 
 unsigned int
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx
index 48f68da28c40a2d591068c3556a000b66b9b7c1f..a242cf60916566ff7ae9ca93e293d48716485637 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx
@@ -120,11 +120,15 @@ ParameterGroup::AddChoice(std::string paramKey, std::string paramName)
       else
         {
           itkExceptionMacro(<<parentkey << " is not a choice");
+		  
         }
     }
   else
     {
-      itkExceptionMacro(<<"No choice parameter key given");
+		itkExceptionMacro(
+					 << "No choice parameter key given: paramKey = '"
+					 << paramKey
+					 << "'");
     }
 }