diff --git a/gazelle-tm-ear/pom.xml b/gazelle-tm-ear/pom.xml
index 6f36d01625190b99409f8ccc946ae2809bf0a895..0cdbcb2e0b19789c527e8709d6d7112b1567790f 100644
--- a/gazelle-tm-ear/pom.xml
+++ b/gazelle-tm-ear/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.ihe.gazelle.tm</groupId>
         <artifactId>gazelle-tm</artifactId>
-        <version>10.0.0-GZL-5399-SNAPSHOT</version>
+        <version>10.0.0-GZL-5395-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/gazelle-tm-ejb/pom.xml b/gazelle-tm-ejb/pom.xml
index df10edb82e8cc8c2bc462b1e1c71aa6c81545d2c..a875fc1b7a6fb52017b404d6f18a23c933226978 100644
--- a/gazelle-tm-ejb/pom.xml
+++ b/gazelle-tm-ejb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.ihe.gazelle.tm</groupId>
         <artifactId>gazelle-tm</artifactId>
-        <version>10.0.0-GZL-5399-SNAPSHOT</version>
+        <version>10.0.0-GZL-5395-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/SystemInSessionOverview.java b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/SystemInSessionOverview.java
index 9fb62e45b2ec738e41cbaeeb0d01fe6fbb084a12..807c0b92681cca5f8dfbd50e1639f4a486a75400 100644
--- a/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/SystemInSessionOverview.java
+++ b/gazelle-tm-ejb/src/main/java/net/ihe/gazelle/tm/gazelletest/action/SystemInSessionOverview.java
@@ -161,8 +161,14 @@ public class SystemInSessionOverview implements Serializable, QueryModifier<Syst
         getSystemsInSession();
         List<SystemUser> systemUsers = new ArrayList<>();
         for (SystemInSession currentSystemInSession : systemsInSession.getAllItems(FacesContext.getCurrentInstance())) {
-            User ownerUser = userService.getUserById(currentSystemInSession.getSystem().getOwnerUserId());
-            systemUsers.add(new SystemUser(ownerUser, currentSystemInSession));
+            try {
+                User ownerUser = userService.getUserById(currentSystemInSession.getSystem().getOwnerUserId());
+                systemUsers.add(new SystemUser(ownerUser, currentSystemInSession));
+            } catch (NoSuchElementException e) {
+                LOG.error("The system owner {} was not found for the system {}",
+                        currentSystemInSession.getSystem().getOwnerUserId(),
+                        currentSystemInSession.getSystem().getName());
+            }
         }
 
         return new GazelleListDataModel<>(systemUsers);
diff --git a/gazelle-tm-war/pom.xml b/gazelle-tm-war/pom.xml
index 6802423590f41bd8afbdd1e915f9d436506fe69d..e5dba4ef0f6705ad3892d4c4354373dea6dd5863 100644
--- a/gazelle-tm-war/pom.xml
+++ b/gazelle-tm-war/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.ihe.gazelle.tm</groupId>
         <artifactId>gazelle-tm</artifactId>
-        <version>10.0.0-GZL-5399-SNAPSHOT</version>
+        <version>10.0.0-GZL-5395-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 0897d8a8b2757af86632a540bbabaa731da07cb6..1991b5a7fda1347f5e1d558e2544ae319d57b1f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.ihe.gazelle.tm</groupId>
     <artifactId>gazelle-tm</artifactId>
-    <version>10.0.0-GZL-5399-SNAPSHOT</version>
+    <version>10.0.0-GZL-5395-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -284,13 +284,13 @@
             <dependency>
                 <groupId>net.ihe.gazelle.tm</groupId>
                 <artifactId>gazelle-tm-ejb</artifactId>
-                <version>10.0.0-GZL-5399-SNAPSHOT</version>
+                <version>10.0.0-GZL-5395-SNAPSHOT</version>
                 <type>ejb</type>
             </dependency>
             <dependency>
                 <groupId>net.ihe.gazelle.tm</groupId>
                 <artifactId>gazelle-tm-war</artifactId>
-                <version>10.0.0-GZL-5399-SNAPSHOT</version>
+                <version>10.0.0-GZL-5395-SNAPSHOT</version>
                 <type>war</type>
             </dependency>
             <dependency>