Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
===================================================================
diff -u -rfd2cfad55c7c517931f69334ce644d509ec28140 -r8ed3b25f15a9ea80cc6f1c3d92210429404501df
--- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
+++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision 8ed3b25f15a9ea80cc6f1c3d92210429404501df)
@@ -65,6 +65,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -493,8 +494,8 @@
     }
 
     @RequestMapping("/outcomeImport")
-    public String outcomeImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response)
-	    throws Exception {
+    public String outcomeImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 	UserDTO user = getUserDTO();
 	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
 
@@ -742,8 +743,8 @@
     }
 
     @RequestMapping("/scaleImport")
-    public String scaleImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response)
-	    throws Exception {
+    public String scaleImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 	UserDTO user = getUserDTO();
 	securityService.isSysadmin(user.getUserID(), "import outcome scales", true);
 
Index: lams_central/web/includes/javascript/outcome.js
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8ed3b25f15a9ea80cc6f1c3d92210429404501df
--- lams_central/web/includes/javascript/outcome.js	(.../outcome.js)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_central/web/includes/javascript/outcome.js	(.../outcome.js)	(revision 8ed3b25f15a9ea80cc6f1c3d92210429404501df)
@@ -8,13 +8,13 @@
 
 function removeOutcome(outcomeId) {
 	if (confirm(LABELS.REMOVE_OUTCOME_CONFIRM_LABEL)) {
-		document.location.href = 'outcome/outcomeRemove.do?organisationID=' + organisationId + '&outcomeId=' + outcomeId;
+		document.location.href = 'outcomeRemove.do?organisationID=' + organisationId + '&outcomeId=' + outcomeId;
 	}
 }
 
 function removeScale(scaleId) {
 	if (confirm(LABELS.REMOVE_SCALE_CONFIRM_LABEL)) {
-		document.location.href = 'outcomeScale/scaleRemove.do?organisationID=' + organisationId + '&scaleId=' + scaleId;
+		document.location.href = 'scaleRemove.do?organisationID=' + organisationId + '&scaleId=' + scaleId;
 	}
 }
 
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -rfd2cfad55c7c517931f69334ce644d509ec28140 -r8ed3b25f15a9ea80cc6f1c3d92210429404501df
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 8ed3b25f15a9ea80cc6f1c3d92210429404501df)
@@ -107,7 +107,7 @@
 			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
 				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
 			</div>
-			<form id="importForm" action="outcome/outcomeImport.do" method="post" enctype="multipart/form-data">
+			<form id="importForm" action="outcomeImport.do" method="post" enctype="multipart/form-data">
 				<input type="file" id="importInput" name="file"/>
 			</form>
 		</c:if>
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -rfd2cfad55c7c517931f69334ce644d509ec28140 -r8ed3b25f15a9ea80cc6f1c3d92210429404501df
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 8ed3b25f15a9ea80cc6f1c3d92210429404501df)
@@ -104,7 +104,7 @@
 			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
 				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
 			</div>
-			<form id="importForm" action="outcome/scaleImport.do" method="post" enctype="multipart/form-data">
+			<form id="importForm" action="scaleImport.do" method="post" enctype="multipart/form-data">
 				<input type="file" id="importInput" name="file"/>
 			</form>
 		</c:if>
Index: lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8ed3b25f15a9ea80cc6f1c3d92210429404501df
--- lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(.../OutcomeService.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(.../OutcomeService.java)	(revision 8ed3b25f15a9ea80cc6f1c3d92210429404501df)
@@ -182,7 +182,7 @@
 	    cell = row.getCell(0);
 	    String name = cell.getStringCellValue();
 	    cell = row.getCell(2);
-	    String description = cell.getStringCellValue();
+	    String description = cell == null ? null : cell.getStringCellValue();
 	    cell = row.getCell(3);
 	    String itemsString = cell.getStringCellValue();
 
@@ -248,7 +248,7 @@
 	    cell = row.getCell(0);
 	    String name = cell.getStringCellValue();
 	    cell = row.getCell(2);
-	    String description = cell.getStringCellValue();
+	    String description = cell == null ? null : cell.getStringCellValue();
 
 	    Outcome outcome = new Outcome();
 	    outcome.setName(name);