diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index 210f90089..703d3fb45 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -278,6 +278,10 @@ private void handleOnShutdownException(final Throwable ex)
     private ExceptionHandler<? super T> getExceptionHandler()
     {
         ExceptionHandler<? super T> handler = exceptionHandler;
-        return handler == null ? ExceptionHandlers.defaultHandler() : handler;
+        if (handler == null)
+        {
+            return ExceptionHandlers.defaultHandler();
+        }
+        return handler;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java b/src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java
index 81f72019a..5c8950a7b 100644
--- a/src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java
+++ b/src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java
@@ -33,6 +33,10 @@ public void handleOnShutdownException(final Throwable ex)
     private ExceptionHandler<? super T> getExceptionHandler()
     {
         ExceptionHandler<? super T> handler = delegate;
-        return handler == null ? ExceptionHandlers.defaultHandler() : handler;
+        if (handler == null)
+        {
+            return ExceptionHandlers.defaultHandler();
+        }
+        return handler;
     }
 }