Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java,v
diff -u -r1.6 -r1.7
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	10 Oct 2005 11:49:23 -0000	1.6
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	23 Jan 2006 07:07:10 -0000	1.7
@@ -234,17 +234,6 @@
 		}
 		return flashMessage.serializeMessage();
 	}	
-	/**
-	 * Checks whether the WDDX packet contains any invalid
-	 * "<null/>". It returns true if there exists any such null
-	 */
-	private boolean containsNulls(String packet)
-	{
-		if (packet.indexOf("<null />") != -1)
-			return true;
-		else
-			return false;
-	}
 	public String copyLearningDesign(Long originalDesignID,Integer copyType,
 									Integer userID, Integer workspaceFolderID)throws UserException, LearningDesignException, 
 											 							      WorkspaceFolderException, IOException{
@@ -420,12 +409,6 @@
 	public String storeLearningDesignDetails(String wddxPacket) throws Exception{
 		LearningDesignDTO learningDesignDTO = null;
 		
-		if(containsNulls(wddxPacket)){
-			flashMessage = new FlashMessage("storeLearningDesignDetails",
-											"WDDXPacket contains null",
-											FlashMessage.ERROR);
-			return flashMessage.serializeMessage();
-		}		
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(wddxPacket);
 		ObjectExtractor extractor = new ObjectExtractor(userDAO,learningDesignDAO,
 														activityDAO,workspaceFolderDAO,
@@ -514,12 +497,6 @@
 	 */
 	public String storeTheme(String wddxPacket) throws Exception {
 		
-		if(containsNulls(wddxPacket)){
-			flashMessage = new FlashMessage("storeTheme",
-											"WDDXPacket contains null",
-											FlashMessage.ERROR);
-			return flashMessage.serializeMessage();
-		}		
 		Hashtable table = (Hashtable)WDDXProcessor.deserialize(wddxPacket);
 		
 		CSSThemeDTO themeDTO = new CSSThemeDTO(table);
Index: lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java	21 Dec 2005 23:34:04 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/web/servlet/AbstractStoreWDDXPacketServlet.java	23 Jan 2006 07:09:20 -0000	1.4
@@ -91,6 +91,13 @@
 				log.debug("Request "+request.getRequestURI()+" received packet "+packet);
 			}
 
+			if(containsNulls(packet)){
+				FlashMessage flashMessage = new FlashMessage(getMessageKey(packet,request),
+												"WDDXPacket contains null",
+												FlashMessage.ERROR);
+				writer.write(flashMessage.serializeMessage());
+			}		
+
 			replyPacket = process(packet, request);
 
 			if ( log.isDebugEnabled() ) {
@@ -103,7 +110,7 @@
 			log.error(uri+" request triggered exception ",e);
 			
 			FlashMessage flashMessage = FlashMessage.getExceptionOccured(getMessageKey(packet,request),
-					e.getMessage()!=null?e.getMessage():"");
+					e.getMessage()!=null?e.getMessage():e.getClass().getName());
 			writer.write(flashMessage.serializeMessage());
 			return;
 		}
@@ -115,6 +122,18 @@
 	
 
 	/**
+	 * Checks whether the WDDX packet contains any invalid
+	 * "<null/>". It returns true if there exists any such null
+	 */
+	private boolean containsNulls(String packet)
+	{
+		if (packet.indexOf("<null />") != -1)
+			return true;
+		else
+			return false;
+	}
+
+	/**
 	 * Method to get the post body.
 	 * Retrieves the body of the post as binary data, and then converts back to a character stream.
 	 * The reason why we didn't use getReader() which retrieves the body of the post as character