diff --git a/bundles/org.openhab.core.io.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java b/bundles/org.openhab.core.io.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java
index 7ee3013ad0f..4244962091f 100644
--- a/bundles/org.openhab.core.io.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java
+++ b/bundles/org.openhab.core.io.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java
@@ -995,8 +995,8 @@ private static SocketImpl newSocksSocketImpl() {
                 Method socketImplCreateMethod = socketImplClass.getDeclaredMethod("createPlatformSocketImpl",
                         boolean.class);
                 socketImplCreateMethod.setAccessible(true);
-                Object socketImpl = socketImplCreateMethod.invoke(/* null since we deal with static method */ null,
-                        /* server */false);
+                Object socketImpl = socketImplCreateMethod
+                        .invoke(/* null since we deal with static method */ giveNull(), /* server */false);
 
                 Constructor<?> socksSocketImplConstructor = socksSocketImplClass
                         .getDeclaredConstructor(socketImplClass);
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
index c9e230aee07..f6d2cd65a9d 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
@@ -263,8 +263,9 @@ private String getFileExtension(String fileName) {
      */
     protected String getLocalizedProposedFilename(String filename, final WatchService watchService) {
         final File file = new File(filename);
-        if (file.getParent() != null) {
-            watchSubDirectory(file.getParent(), watchService);
+        final String parent = file.getParent();
+        if (parent != null) {
+            watchSubDirectory(parent, watchService);
         }
 
         String sourcePath = getSourcePath();
diff --git a/pom.xml b/pom.xml
index 8de7dbecccd..b3e65e4a7d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
     <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
-    <eea.version>2.3.0</eea.version>
+    <eea.version>2.4.0</eea.version>
     <karaf.compile.version>4.4.6</karaf.compile.version>
     <karaf.tooling.version>4.4.6</karaf.tooling.version>
     <sat.version>0.16.0</sat.version>