From 471dd021431fc6947db2354da870df7608125494 Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Tue, 29 Jan 2013 09:25:19 -0600
Subject: [PATCH] Issue #1526 improved exception handling per code review
 comments

Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: 6abffb7aeb4011db9f6380fc644312b408bb75fa
---
 .../uf/common/comm/stream/DynamicSerializeStreamEntity.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/stream/DynamicSerializeStreamEntity.java b/edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/stream/DynamicSerializeStreamEntity.java
index ce1e54045c..d1c2162c4a 100644
--- a/edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/stream/DynamicSerializeStreamEntity.java
+++ b/edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/stream/DynamicSerializeStreamEntity.java
@@ -108,8 +108,8 @@ public class DynamicSerializeStreamEntity extends AbstractHttpEntity {
             DynamicSerializationManager.getManager(SerializationType.Thrift)
                     .serialize(obj, os);
         } catch (SerializationException e) {
-            throw new IOException("Error serializing " + obj.getClass()
-                    + " to stream", e);
+            throw new IOException("Error serializing "
+                    + (obj != null ? obj.getClass() : null) + " to stream", e);
         }
     }