Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
===================================================================
diff -u -rd7c291bd9f76db5630b5533afde1a24c649e7cae -r64ff024c2b81e5d3f75ed1b3f098aa0581aea6d8
--- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision d7c291bd9f76db5630b5533afde1a24c649e7cae)
+++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision 64ff024c2b81e5d3f75ed1b3f098aa0581aea6d8)
@@ -432,6 +432,7 @@
 	public void setAttribute(String name, Object value) {
 	    if (value == null) {
 		removeAttribute(name);
+		return;
 	    }
 
 	    Object old = valueMap.put(name, value);