diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml
index 146d0401..b93a6be2 100644
--- a/.github/workflows/build-maven.yml
+++ b/.github/workflows/build-maven.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: 'temurin'
diff --git a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java
index f94cd06c..7413c176 100644
--- a/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java
+++ b/interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/util/DaemonExceptionMapper.java
@@ -31,9 +31,9 @@ public class DaemonExceptionMapper {
      */
     public static void mapAndThrow(Exception e) throws DaemonError, TimeoutException {
         Exception exception = DaemonExceptionMapper.map(e);
-        if (e instanceof DaemonError) {
+        if (exception instanceof DaemonError) {
             throw (DaemonError) exception;
-        } else if (e instanceof TimeoutException) {
+        } else if (exception instanceof TimeoutException) {
             throw (TimeoutException) exception;
         } else {
             throw new UnsupportedOperationException("Failed to map exception", e);