Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java,v
diff -u -r1.5.2.7 -r1.5.2.8
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	15 May 2009 09:24:11 -0000	1.5.2.7
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java	18 May 2009 06:13:55 -0000	1.5.2.8
@@ -339,8 +339,11 @@
 	    
 	    // reset it to new toolContentId
 	    videoRecorder.setToolContentId(toolContentId);
-	    videoRecorder.getAuthorRecording().setToolContentId(toolContentId);
-
+	    
+	    if(recording != null) {
+	    	videoRecorder.getAuthorRecording().setToolContentId(toolContentId);
+	    }
+	    
 	    videoRecorderDAO.saveOrUpdate(videoRecorder);
 	    
 	    if(recording != null){