diff --git a/src/main/java/io/temporal/activity/Activity.java b/src/main/java/io/temporal/activity/Activity.java
index d7ba631064..ead45178da 100644
--- a/src/main/java/io/temporal/activity/Activity.java
+++ b/src/main/java/io/temporal/activity/Activity.java
@@ -237,13 +237,12 @@ public static ActivityExecutionContext getExecutionContext() {
    * try {
    *     return someCall();
    * } catch (Exception e) {
-   *     throw CheckedExceptionWrapper.throwWrapped(e);
+   *     throw Activity.wrap(e);
    * }
    * </pre>
    *
-   * If throwWrapped returned void it wouldn't be possible to write <code>
-   * throw CheckedExceptionWrapper.throwWrapped</code> and compiler would complain about missing
-   * return.
+   * If wrap returned void it wouldn't be possible to write <code>
+   * throw Activity.wrap</code> and compiler would complain about missing return.
    *
    * @return never returns as always throws.
    */
diff --git a/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java b/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java
index 16dfe0d275..c64bde32ed 100644
--- a/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java
+++ b/src/main/java/io/temporal/internal/sync/WorkflowRetryerInternal.java
@@ -187,12 +187,16 @@ private static <R> Promise<R> retryAsync(
 
   private static RetryOptions getRetryOptionsSideEffect(String retryId, RetryOptions options) {
     options = RetryOptions.newBuilder(options).validateBuildWithDefaults();
+    long maximumIntervalMillis =
+        options.getMaximumInterval() != null ? options.getMaximumInterval().toMillis() : 0;
+    long initialIntervalMillis =
+        options.getInitialInterval() != null ? options.getInitialInterval().toMillis() : 0;
     SerializableRetryOptions sOptions =
         new SerializableRetryOptions(
-            options.getInitialInterval().toMillis(),
+            initialIntervalMillis,
             options.getBackoffCoefficient(),
             options.getMaximumAttempts(),
-            options.getMaximumInterval().toMillis(),
+            maximumIntervalMillis,
             options.getDoNotRetry());
     SerializableRetryOptions sRetryOptions =
         WorkflowInternal.mutableSideEffect(
diff --git a/src/main/java/io/temporal/workflow/Workflow.java b/src/main/java/io/temporal/workflow/Workflow.java
index 41093abc08..993d96d526 100644
--- a/src/main/java/io/temporal/workflow/Workflow.java
+++ b/src/main/java/io/temporal/workflow/Workflow.java
@@ -821,7 +821,7 @@ public static void retry(
    * try {
    *     return someCall();
    * } catch (Exception e) {
-   *     throw CheckedExceptionWrapper.wrap(e);
+   *     throw Workflow.wrap(e);
    * }
    * </pre>
    *
diff --git a/src/test/java/io/temporal/workflow/WorkflowTest.java b/src/test/java/io/temporal/workflow/WorkflowTest.java
index 8d7402be49..d279fd7c17 100644
--- a/src/test/java/io/temporal/workflow/WorkflowTest.java
+++ b/src/test/java/io/temporal/workflow/WorkflowTest.java
@@ -713,12 +713,7 @@ public String execute(String taskList) {
                 .setMaximumAttempts(3)
                 .build();
       } else {
-        retryOptions =
-            RetryOptions.newBuilder()
-                .setMaximumInterval(Duration.ofSeconds(1))
-                .setInitialInterval(Duration.ofSeconds(1))
-                .setMaximumAttempts(2)
-                .build();
+        retryOptions = RetryOptions.newBuilder().setMaximumAttempts(2).build();
       }
       TestActivities activities = Workflow.newActivityStub(TestActivities.class, options.build());
       Workflow.retry(retryOptions, Optional.of(Duration.ofDays(1)), () -> activities.throwIO());