diff --git a/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java b/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
index 40e01da..f881b63 100644
--- a/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
+++ b/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
@@ -100,7 +100,7 @@
      */
     @Override
     public boolean equals(Object o) {
-        if (o != null && o instanceof Map.Entry) {
+        if (o instanceof Map.Entry) {
             Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
             return (this.getKey() == null ?
                     entry.getKey() == null : this.getKey().equals(entry.getKey()))  &&
diff --git a/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java b/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
index cd5679d..8600f52 100644
--- a/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
+++ b/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
@@ -84,7 +84,7 @@
          */
         @SuppressWarnings("unchecked")
         Catalog<String, Object, ServletWebContext<String, Object>> catalog =
-                testCatalog != null && testCatalog instanceof Catalog ?
+                testCatalog instanceof Catalog ?
                     (Catalog<String, Object, ServletWebContext<String, Object>>) testCatalog :
                     super.getCatalog(context);