diff --git a/commons/geo/src/main/java/ru/org/openam/geo/Info.java b/commons/geo/src/main/java/ru/org/openam/geo/Info.java
index b1c3a0d831..21c6b39d59 100644
--- a/commons/geo/src/main/java/ru/org/openam/geo/Info.java
+++ b/commons/geo/src/main/java/ru/org/openam/geo/Info.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2020-2024 3A Systems LLC.
+ * Copyright 2020-2026 3A Systems LLC.
  */
 
 package ru.org.openam.geo;
@@ -48,9 +48,9 @@ public Boolean isLAN(){
 	@Override
 	public String toString() {
 		if (ip!=null&&ip.isSiteLocalAddress())
-			return MessageFormat.format("{0} ({1})",(ip!=null)?ip.getHostAddress():ipString,"LAN");
+			return MessageFormat.format("{0} ({1})",ip.getHostAddress(),"LAN");
 		else if (ip!=null&&ip.isLoopbackAddress())
-			return MessageFormat.format("{0} ({1})",(ip!=null)?ip.getHostAddress():ipString,"LOCALHOST");
+			return MessageFormat.format("{0} ({1})",ip.getHostAddress(),"LOCALHOST");
 		else if (l!=null)
 			return MessageFormat.format("{0} ({1}:{2}/{3})",
 					(ip!=null)?ip.getHostAddress():ipString,
diff --git a/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java b/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
index 3964310a43..4bcca10b28 100644
--- a/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
+++ b/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010–2011 ApexIdentity Inc.
  * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.protocol;
@@ -285,7 +286,7 @@ public int hashCode() {
         result = prime * result + (maxAge == null ? 0 : maxAge.hashCode());
         result = prime * result + (name == null ? 0 : name.hashCode());
         result = prime * result + (path == null ? 0 : path.hashCode());
-        result = prime * result + (port == null ? 0 : port.hashCode());
+        result = prime * result + port.hashCode();
         result = prime * result + (secure == null ? 0 : secure.hashCode());
         result = prime * result + (sameSite == null ? 0 : sameSite.hashCode());
         result = prime * result + (value == null ? 0 : value.hashCode());
@@ -488,9 +489,7 @@ public String toString() {
         if (path != null) {
             builder.append("path=").append(path).append(" ");
         }
-        if (port != null) {
-            builder.append("port=").append(port).append(" ");
-        }
+        builder.append("port=").append(port).append(" ");
         if (secure != null) {
             builder.append("secure=").append(secure).append(" ");
         }
diff --git a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
index c107e5d658..d49632ddbd 100644
--- a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
+++ b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
@@ -334,14 +334,13 @@ public void init() throws Exception {
                             		   );
                 }
             } else {
-                input =
-                        new BufferedReader(new InputStreamReader(Main.class
-                                .getResourceAsStream("/launcher.json")));
-                if (null == input) {
+                final InputStream configStream = Main.class.getResourceAsStream("/launcher.json");
+                if (null == configStream) {
                     throw new IllegalArgumentException(
                             "Boot OSGi configuration file does not exists on CLASSPATH: "
                                     + Main.class.getResource("/").toString() + "/launcher.json");
                 }
+                input = new BufferedReader(new InputStreamReader(configStream));
             }
             launcherConfiguration = new JsonValue((new JSONParser()).parse(input));
             launcherConfiguration.getTransformers().add(transformer);
diff --git a/persistit/core/src/main/java/com/persistit/Persistit.java b/persistit/core/src/main/java/com/persistit/Persistit.java
index 7bf86b3884..3cec585783 100644
--- a/persistit/core/src/main/java/com/persistit/Persistit.java
+++ b/persistit/core/src/main/java/com/persistit/Persistit.java
@@ -1736,12 +1736,10 @@ private void interruptActiveThreads(final long timeout) throws PersistitInterrup
    */
   public void crash() {
     final JournalManager journalManager = _journalManager;
-    if (journalManager != null) {
-      try {
-        journalManager.crash();
-      } catch (final IOException e) {
-        _logBase.exception.log(e);
-      }
+    try {
+      journalManager.crash();
+    } catch (final IOException e) {
+      _logBase.exception.log(e);
     }
     //
     // Even on simulating a crash we need to try to close
@@ -1757,10 +1755,8 @@ public void crash() {
       }
     }
     final Map<Integer, BufferPool> buffers = _bufferPoolTable;
-    if (buffers != null) {
-      for (final BufferPool pool : buffers.values()) {
-        pool.crash();
-      }
+    for (final BufferPool pool : buffers.values()) {
+      pool.crash();
     }
     _transactionIndex.crash();
     _cleanupManager.crash();