1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
index 2d763a306d..dc38590f0a 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
@@ -43,8 +43,9 @@ namespace Org.Apache.Qpid.Messaging.Examples {
                 Duration timeout = options.Forever ? 
                                    DurationConstants.FORVER : 
                                    DurationConstants.SECOND * options.Timeout;
-                Message message = new Message();
-                while (receiver.Fetch(message, timeout))
+                Message message;
+
+                while ((message = receiver.Fetch(timeout)) != null)
                 {
                     Dictionary<string, object> properties = new Dictionary<string, object>();
                     properties = message.Properties;