diff --git a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java b/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
index 527121de78..69508e55b3 100644
--- a/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
+++ b/edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
@@ -40,12 +40,14 @@ import com.raytheon.uf.common.util.SizeUtil;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 10, 2009            mschenke     Initial creation
- * Jul 24, 2012            njensen      Enhanced logging
- * Jun 24, 2013 2136       rjpeter      Switched to accepting InputStream to reduce garbage
- *                                      objected generated by camel doing the auto conversion.
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- -----------------------------------------
+ * Aug 10, 2009           mschenke    Initial creation
+ * Jul 24, 2012           njensen     Enhanced logging
+ * Jun 24, 2013  2136     rjpeter     Switched to accepting InputStream to
+ *                                    reduce garbage objected generated by
+ *                                    camel doing the auto conversion.
+ * Feb 06, 2014  2672     bsteffen    Return error when Stream is not consumed.
  * </pre>
  * 
  * @author mschenke
@@ -64,6 +66,11 @@ public class RemoteRequestRouteWrapper {
             long startTime = System.currentTimeMillis();
             Object obj = SerializationUtil.transformFromThrift(Object.class,
                     data);
+            int remaining = data.available();
+            if (remaining > 0) {
+                throw new IllegalStateException(remaining
+                        + " unexpected bytes remaining after deserialization");
+            }
             IServerRequest request = null;
             if (obj instanceof RequestWrapper) {
                 request = ((RequestWrapper) obj).getRequest();
diff --git a/pythonPackages/dynamicserialize/adapters/__init__.py b/pythonPackages/dynamicserialize/adapters/__init__.py
index cd3407b26f..83ccb89571 100644
--- a/pythonPackages/dynamicserialize/adapters/__init__.py
+++ b/pythonPackages/dynamicserialize/adapters/__init__.py
@@ -30,6 +30,8 @@
 #    08/31/10                      njensen       Initial Creation.
 #    03/20/13           #1774      randerso      Added TimeConstraintsAdapter
 #    04/22/13           #1949      rjpeter       Added LockTableAdapter
+#    02/06/14           #2672      bsteffen      Added JTSEnvelopeAdapter
+
 # 
 #
 
@@ -53,7 +55,8 @@ __all__ = [
            'FloatBufferAdapter',
            'ByteBufferAdapter',
            'TimeConstraintsAdapter',
-           'LockTableAdapter'
+           'LockTableAdapter',
+           'JTSEnvelopeAdapter'
 #           'GridDataHistoryAdapter',
            ]