--- java/org/apache/catalina/session/StandardSession.java	(revision 1763320)
+++ java/org/apache/catalina/session/StandardSession.java	(revision )
@@ -16,13 +16,13 @@ 
  */
 package org.apache.catalina.session;
 
+
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.io.WriteAbortedException;
 import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedAction;
@@ -38,7 +38,6 @@ 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionActivationListener;
@@ -48,7 +47,6 @@ 
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionIdListener;
 import javax.servlet.http.HttpSessionListener;
-
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Manager;
@@ -1622,12 +1620,9 @@ 
             final Object value;
             try {
                 value = stream.readObject();
-            } catch (WriteAbortedException wae) {
-                if (wae.getCause() instanceof NotSerializableException) {
-                    // Skip non serializable attributes
-                    continue;
-                }
-                throw wae;
+            } catch (Exception ex) {
+                throw new IOException(String.format(
+                        "Can't deserialize the value of the attribute '%s'.", name), ex);
             }
             if (manager.getContext().getLogger().isDebugEnabled())
                 manager.getContext().getLogger().debug("  loading attribute '" + name +