Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -re562dffe944a8d39265b6c2f655c8455bd7c251d -r39c01a1dca00f314cfdbaadfadf123b2f27ab580
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision e562dffe944a8d39265b6c2f655c8455bd7c251d)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 39c01a1dca00f314cfdbaadfadf123b2f27ab580)
@@ -307,7 +307,7 @@
 			</sql>
 			<delete quiet="true" dir ="${contentrepository.location}"/>
 		</target>
-x
+
 	<!-- =================================================================== -->
 	<!-- Generate the deploy package                                         -->
 	<!-- =================================================================== -->
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
diff -u -rb496f01cb0de2c2968b080bced80c36ce24bb323 -r39c01a1dca00f314cfdbaadfadf123b2f27ab580
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision b496f01cb0de2c2968b080bced80c36ce24bb323)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	(.../FileDetailsDTO.java)	(revision 39c01a1dca00f314cfdbaadfadf123b2f27ab580)
@@ -62,11 +62,12 @@
 		this.dateOfSubmission = details.getDateOfSubmission();
 		this.uuID = details.getUuid();
 		this.versionID = details.getVersionID();
-		
-		this.reportID = report.getReportID();
-		this.dateMarksReleased = report.getDateMarksReleased();		
-		this.comments = report.getComments();
-		this.marks = report.getMarks();
+		if(report != null){
+			this.reportID = report.getReportID();
+			this.dateMarksReleased = report.getDateMarksReleased();		
+			this.comments = report.getComments();
+			this.marks = report.getMarks();
+		}
 	}
 	public FileDetailsDTO(SubmissionDetails details){
 		
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rdf1375bbde992f59d04ee895a971eb4dfa7282b1 -r39c01a1dca00f314cfdbaadfadf123b2f27ab580
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision df1375bbde992f59d04ee895a971eb4dfa7282b1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 39c01a1dca00f314cfdbaadfadf123b2f27ab580)
@@ -379,8 +379,7 @@
 		else {
 			NodeKey nodeKey = uploadFileToRepository(stream, fileName, mimeType);
 			SubmissionDetails details = new SubmissionDetails(filePath,fileDescription,dateOfSubmission,
-															  nodeKey.getUuid(),nodeKey.getVersion(),
-															  userID);
+															  userID,nodeKey.getUuid(),nodeKey.getVersion());
 			//update session, then insert the detail too.
 			Set detailSet = session.getSubmissionDetails();
 			detailSet.add(details);