diff --git a/src/main/java/org/orekit/data/ZipJarCrawler.java b/src/main/java/org/orekit/data/ZipJarCrawler.java
index ec5c9dc0af..ebf2ecdc67 100644
--- a/src/main/java/org/orekit/data/ZipJarCrawler.java
+++ b/src/main/java/org/orekit/data/ZipJarCrawler.java
@@ -288,6 +288,10 @@ public boolean hasNext() {
                 /** {@inheritDoc} */
                 @Override
                 public EntryStream next() throws NoSuchElementException {
+                    if (next == null) {
+                        // this should never happen
+                        throw new NoSuchElementException();
+                    }
                     return next;
                 }
 
diff --git a/src/main/java/org/orekit/estimation/measurements/Range.java b/src/main/java/org/orekit/estimation/measurements/Range.java
index 482578e64e..f8bcfa66ad 100644
--- a/src/main/java/org/orekit/estimation/measurements/Range.java
+++ b/src/main/java/org/orekit/estimation/measurements/Range.java
@@ -162,8 +162,8 @@ protected EstimatedMeasurement<Range> theoreticalEvaluation(final int iteration,
             dRdPx * dt, dRdPy * dt, dRdPz * dt
         });
 
-        if (station.getEastOffsetDriver().isSelected()  |
-            station.getNorthOffsetDriver().isSelected() |
+        if (station.getEastOffsetDriver().isSelected()  ||
+            station.getNorthOffsetDriver().isSelected() ||
             station.getZenithOffsetDriver().isSelected()) {
 
             // donwlink partial derivatives
diff --git a/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java b/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java
index 091151b309..e264d057ab 100644
--- a/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java
+++ b/src/main/java/org/orekit/propagation/integration/IntegratedEphemeris.java
@@ -187,11 +187,7 @@ protected SpacecraftState basicPropagate(final AbsoluteDate date)
             }
             return state;
         } catch (OrekitExceptionWrapper oew) {
-            if (oew.getException() instanceof OrekitException) {
-                throw (OrekitException) oew.getException();
-            } else {
-                throw new OrekitException(oew.getException());
-            }
+            throw oew.getException();
         }
     }