1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 88fee1df3c7..05a33d2294a 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -175,7 +175,14 @@ IceInternal::Outgoing::invoke()
 	case Reference::ModeOneway:
 	case Reference::ModeDatagram:
 	{
-	    _connection->sendRequest(this, true);
+	    try
+	    {
+		_connection->sendRequest(this, true);
+	    }
+	    catch(const DatagramLimitException& ex)
+	    {
+		throw NonRepeatable(ex);
+	    }
 	    _state = StateInProgress;
 	    break;
 	}