Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -red2ba1bbc68b8f3ed22c009b0942ae6967b290a2 -r543fd272dab584d5c2f0052df9413709f400821c
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision ed2ba1bbc68b8f3ed22c009b0942ae6967b290a2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 543fd272dab584d5c2f0052df9413709f400821c)
@@ -419,6 +419,13 @@
 		else
 			file = (FormFile) forumForm.getOnlineFile();
 		
+		if(file == null || StringUtils.isBlank(file.getFileName())){
+			ActionMessages msg = new ActionMessages();
+			msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.uploading"));
+			saveErrors(request, msg);
+			return mapping.findForward("success");
+		}
+		
 		forumService = getForumManager();
 		//upload to repository
 		Attachment att = forumService.uploadInstructionFile(file, type);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r0d2f196fb56f3fe9da7f0fb73717ef655554a1fd -r543fd272dab584d5c2f0052df9413709f400821c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0d2f196fb56f3fe9da7f0fb73717ef655554a1fd)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 543fd272dab584d5c2f0052df9413709f400821c)
@@ -42,6 +42,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -279,6 +281,13 @@
 		else
 			file = (FormFile) authForm.getOnlineFile();
 		
+		if(file == null || StringUtils.isBlank(file.getFileName())){
+			ActionMessages msg = new ActionMessages();
+			msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("sbmt.web.action.upload.exception"));
+			saveErrors(request, msg);
+			return mapping.getInputForward();
+		}
+			
 		//upload to repository
 		InstructionFiles att = submitFilesService.uploadFileToContent(authForm.getToolContentID(), file, type);