Index: src/main/org/jboss/seam/contexts/ServerConversationContext.java
===================================================================
--- src/main/org/jboss/seam/contexts/ServerConversationContext.java	(revision 14073)
+++ src/main/org/jboss/seam/contexts/ServerConversationContext.java	(working copy)
@@ -291,18 +291,21 @@
           }
           removals.clear();
 
-          // TODO this is a hack! We should find a more elegant way of handling
-          // new objects being added to additions during the following for-loop
-          PersistenceContexts.instance();
+          // Nothing to do if there is no addition
+          if (!additions.isEmpty()) {
+              // TODO this is a hack! We should find a more elegant way of handling
+              // new objects being added to additions during the following for-loop
+              PersistenceContexts.instance();
           
-          //add new objects
-          for (Map.Entry<String, Object> entry: additions.entrySet())  {
-              Object attribute = entry.getValue();
+              //add new objects
+              for (Map.Entry<String, Object> entry: additions.entrySet())  {
+                  Object attribute = entry.getValue();
               
-              passivate(attribute); 
-              session.put(getKey(entry.getKey()), attribute);
+                  passivate(attribute); 
+                  session.put(getKey(entry.getKey()), attribute);
+              }
+              additions.clear();
           }
-          additions.clear();
       }
       else
       {