diff --git a/src/main/java/io/reactivex/Flowable.java b/src/main/java/io/reactivex/Flowable.java
index de381e206e..ab817bf8a8 100644
--- a/src/main/java/io/reactivex/Flowable.java
+++ b/src/main/java/io/reactivex/Flowable.java
@@ -8598,7 +8598,7 @@ public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleS
      *            {@link Consumer} to execute for each item.
      * @return
      *            a Disposable that allows cancelling an asynchronous sequence
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null
      * @throws RuntimeException
      *             if the Publisher calls {@code onError}
@@ -12070,7 +12070,7 @@ public final Disposable subscribe(Consumer<? super T> onNext) {
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the Publisher has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null
      */
@@ -12101,7 +12101,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
      *             Publisher
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the Publisher has finished sending them
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null, or
      *             if {@code onComplete} is null
@@ -12137,7 +12137,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
      *             the {@code Consumer} that receives the upstream's Subscription
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the Publisher has finished sending them
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null, or
      *             if {@code onComplete} is null
diff --git a/src/main/java/io/reactivex/Maybe.java b/src/main/java/io/reactivex/Maybe.java
index 0e31cb903d..99c08ac90a 100644
--- a/src/main/java/io/reactivex/Maybe.java
+++ b/src/main/java/io/reactivex/Maybe.java
@@ -3445,7 +3445,7 @@ public final Disposable subscribe(Consumer<? super T> onSuccess) {
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the Maybe has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onSuccess} is null, or
      *             if {@code onError} is null
      */
@@ -3472,7 +3472,7 @@ public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? supe
      *             Maybe
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the Maybe has finished sending them
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onSuccess} is null, or
      *             if {@code onError} is null, or
      *             if {@code onComplete} is null
diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java
index 938126413d..e098c00154 100644
--- a/src/main/java/io/reactivex/Observable.java
+++ b/src/main/java/io/reactivex/Observable.java
@@ -7420,7 +7420,7 @@ public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends Singl
      *            {@link Consumer} to execute for each item.
      * @return
      *            a Disposable that allows cancelling an asynchronous sequence
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null
      * @throws RuntimeException
      *             if the ObservableSource calls {@code onError}
@@ -10059,7 +10059,7 @@ public final Disposable subscribe(Consumer<? super T> onNext) {
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the ObservableSource has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null
      */
@@ -10086,7 +10086,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
      *             ObservableSource
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the ObservableSource has finished sending them
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null, or
      *             if {@code onComplete} is null
@@ -10118,7 +10118,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
      *             the {@code Consumer} that receives the upstream's Disposable
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the ObservableSource has finished sending them
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onNext} is null, or
      *             if {@code onError} is null, or
      *             if {@code onComplete} is null
diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java
index 85797f9c88..c9dd7a43de 100644
--- a/src/main/java/io/reactivex/Single.java
+++ b/src/main/java/io/reactivex/Single.java
@@ -2444,7 +2444,7 @@ public final Disposable subscribe() {
      *            (whichever is not null)
      * @return a {@link Disposable} reference can request the {@link Single} stop work.
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onCallback} is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2490,7 +2490,7 @@ public final Disposable subscribe(Consumer<? super T> onSuccess) {
      *            Single
      * @return a {@link Disposable} reference can request the {@link Single} stop work.
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
-     * @throws IllegalArgumentException
+     * @throws NullPointerException
      *             if {@code onSuccess} is null, or
      *             if {@code onError} is null
      */