diff --git a/src/main/java/org/olat/core/gui/components/table/Table.java b/src/main/java/org/olat/core/gui/components/table/Table.java
index c4884ca3740a45319c37ac18886fd62f57ac18af..f0e96ea9b9a271368678568895f9739ec7f1a3a5 100644
--- a/src/main/java/org/olat/core/gui/components/table/Table.java
+++ b/src/main/java/org/olat/core/gui/components/table/Table.java
@@ -186,7 +186,10 @@ public class Table extends AbstractComponent {
 	 * @return Column descriptor of currently sorted column
 	 */
 	protected ColumnDescriptor getCurrentlySortedColumnDescriptor() {
-		return getColumnDescriptor(sortColumn);
+		if(columnOrder.size() >= 0 && sortColumn < columnOrder.size()) {
+			return getColumnDescriptor(sortColumn);
+		}
+		return null;
 	}
 
 	/**
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java
index ce5df2ab913279b7e8cbf4aba27a3632d24bfb6d..ab44c75e8b6e07c98423b5629f380c2e93f54a63 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java
@@ -184,7 +184,7 @@ public class CertificateAndEfficiencyStatementController extends BasicController
 			selectCertificate(ureq);
 		}
 		
-		if(statementOwner.equals(ureq.getIdentity())) {
+		if(efficiencyStatement != null && statementOwner.equals(ureq.getIdentity())) {
 			EPArtefactHandler<?> artHandler = portfolioModule.getArtefactHandler(EfficiencyStatementArtefact.ARTEFACT_TYPE);
 			if(portfolioModule.isEnabled() && artHandler != null && artHandler.isEnabled()) {
 				collectArtefactLink = LinkFactory.createCustomLink("collectArtefactLink", "collectartefact", "", Link.NONTRANSLATED, mainVC, this);
@@ -365,7 +365,7 @@ public class CertificateAndEfficiencyStatementController extends BasicController
 			artefact.setAuthor(getIdentity());//only author can create artefact
 			//no business path becouse we cannot launch an efficiency statement
 			artefact.setCollectionDate(new Date());
-			artefact.setTitle(translate("artefact.title", new String[]{efficiencyStatement.getCourseTitle()}));
+			artefact.setTitle(translate("artefact.title", new String[]{ efficiencyStatement.getCourseTitle() }));
 			artHandler.prefillArtefactAccordingToSource(artefact, efficiencyStatement);
 			ePFCollCtrl = new ArtefactWizzardStepsController(ureq, getWindowControl(), artefact, (VFSContainer)null);
 			listenTo(ePFCollCtrl);
diff --git a/src/main/java/org/olat/modules/fo/ui/MessageListController.java b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
index 48ffe04f6d3831efae839c3772074e40eec7ba63..be46848777946d13643d2a57a077acf403bef89f 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageListController.java
+++ b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
@@ -891,7 +891,7 @@ public class MessageListController extends BasicController implements GenericEve
 				if(reloadedMessage.getParent() == null) {
 					forumManager.deleteMessageTree(forum.getKey(), reloadedMessage);
 					//delete topics
-					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_DELETE, getClass(),
+					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_DELETE, getClass(),
 							LoggingResourceable.wrap(reloadedMessage));
 					//back to thread list
 					fireEvent(ureq, new DeleteThreadEvent());
@@ -905,7 +905,7 @@ public class MessageListController extends BasicController implements GenericEve
 						thread = threadTop;//update with the fresh version
 					}
 					showInfo("deleteok");
-					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_DELETE, getClass(),
+					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_DELETE, getClass(),
 						LoggingResourceable.wrap(reloadedMessage));
 					//reload
 					reloadModelAfterDelete(ureq, message);