Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -rf6247c953cc7bf9a17d4025ea8e8728ae55c11ed -r9e682546243fcbd7f5acb78fd074f4a904c187be
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision f6247c953cc7bf9a17d4025ea8e8728ae55c11ed)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision 9e682546243fcbd7f5acb78fd074f4a904c187be)
@@ -523,6 +523,10 @@
     @Override
     public Long findMatchingRatActivity(long toolContentId) {
 	ToolActivity ratActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
+	if (ratActivity == null) {
+	    // this activity has not been saved yet
+	    return null;
+	}
 	Long iRatToolContentId = null;
 	Long tRatToolContentId = null;