Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java,v diff -u -r1.41.2.1 -r1.41.2.2 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java 26 Nov 2014 22:02:39 -0000 1.41.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java 22 Jun 2015 03:06:45 -0000 1.41.2.2 @@ -696,7 +696,7 @@ * The firstActivityUIID to set. */ public void setFirstActivityUIID(Integer firstActivityUIID) { - if (!firstActivityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) + if (firstActivityUIID != null && !firstActivityUIID.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) this.firstActivityUIID = firstActivityUIID; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java,v diff -u -r1.121.2.5 -r1.121.2.6 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 19 Jan 2015 14:03:23 -0000 1.121.2.5 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java 22 Jun 2015 03:06:45 -0000 1.121.2.6 @@ -1302,7 +1302,7 @@ } } catch (Exception e) { - throw new ImportToolContentException(e); + throw new ImportToolContentException("Error while importing a sequence", e); } ldResults[0] = ldId;