diff --git a/pom.xml b/pom.xml
index 5f9d166e2bfb8cb6822046c39cba746f99e92dfa..455e72dcc79c17df4afb2460fa64c7dec663c3e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<targetJdk>1.8</targetJdk>
-		<org.springframework.version>5.2.5.RELEASE</org.springframework.version>
-		<org.hibernate.version>5.4.14.Final</org.hibernate.version>
+		<org.springframework.version>5.2.6.RELEASE</org.springframework.version>
+		<org.hibernate.version>5.4.15.Final</org.hibernate.version>
 		<apache.cxf>3.3.6</apache.cxf>
 		<apache.pdfbox>2.0.19</apache.pdfbox>
 		<apache.poi>4.1.2</apache.poi>
diff --git a/src/main/java/org/olat/admin/sysinfo/UserSessionController.java b/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
index dd7aa279166ce638f5a6176ab57474878b3fb65c..867c5f589911c9a0dbe8192eca07c8925cb0c84c 100644
--- a/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
+++ b/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
@@ -116,7 +116,9 @@ public class UserSessionController extends BasicController implements Breadcrumb
 		Collection<UserSession> authUserSessions = sessionManager.getAuthenticatedUserSessions();
 		List<UserSessionView> authUserSessionViews = new ArrayList<>(authUserSessions.size());
 		for(UserSession authUserSession:authUserSessions) {
-			authUserSessionViews.add(new UserSessionView(authUserSession));
+			if(authUserSession != null) {
+				authUserSessionViews.add(new UserSessionView(authUserSession));
+			}
 		}
 		usessTableModel = new UserSessionTableModel(authUserSessionViews, getIdentity().getKey());
 		tableCtr.setTableDataModel(usessTableModel);
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index f9b257f04a87243e97fd521a7d26c26294fd8db9..8557ae088e53f9d016fcc83eb8f77aed977689a1 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -249,8 +249,6 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 		// ------ all the frame preparation is finished ----
 		initializeBase(ureq, initialPanel);
 		
-		logAudit("BaseFullWebappController: " + usess.getEntry(PRESENTED_AFTER_LOGIN_WORKFLOW));
-		
 		if(usess.isAuthenticated() && !isAdmin && usess.getAssessmentModes() != null && !usess.getAssessmentModes().isEmpty()) {
     		assessmentGuardCtrl = new AssessmentModeGuardController(ureq, getWindowControl(),
     				usess.getAssessmentModes(), false);
diff --git a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
index 23985c1d1fcf39e33a44e7178dae7ff34b281878..679fefcabff8d1b95469cd91954d4c4de68b5365 100644
--- a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
+++ b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.FlushModeType;
 import javax.persistence.TypedQuery;
 
 import org.olat.basesecurity.Group;
@@ -430,6 +431,7 @@ public class AssessmentEntryDAO {
 				.createQuery(sb.toString(), AssessmentEntryScoring.class)
 				.setParameter("identityKey", assessedIdentity.getKey())
 				.setParameter("entryKeys", entryKeys)
+				.setFlushMode(FlushModeType.COMMIT)
 				.getResultList();
 	}