1 files changed, 5 insertions, 13 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 1a877a16b67..97c009dce31 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -194,7 +194,7 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
                 }
                 catch(const DeploymentException& ex)
                 {
-                    throw ex.reason;
+                    throw runtime_error(ex.reason);
                 }
             }
             else
@@ -468,13 +468,9 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
 
         attributes.checkUnknownAttributes();
     }
-    catch(const string& reason)
+    catch(const exception& ex)
     {
-        error(reason);
-    }
-    catch(const char* reason)
-    {
-        error(reason);
+        error(ex.what());
     }
 
     //
@@ -690,13 +686,9 @@ DescriptorHandler::endElement(const string& name, int line, int column)
             _inDistrib = false;
         }
     }
-    catch(const string& reason)
-    {
-        error(reason);
-    }
-    catch(const char* reason)
+    catch(const exception& ex)
     {
-        error(reason);
+        error(ex.what());
     }
 
     //