diff -r 8dea18a54031 -r f082177c5023 src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java	Tue Sep 03 22:54:46 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventStream.java	Thu Sep 05 16:46:50 2019 +0200
@@ -173,10 +173,11 @@
      *
      * @return {@code true} if the action was removed, {@code false} otherwise
      *
-     * @see #onClose(Runnable)
-     * @see #onFlush(Runnable)
      * @see #onEvent(Consumer)
      * @see #onEvent(String, Consumer)
+     * @see #onFlush(Runnable)
+     * @see #onClose(Runnable)
+     * @see #onError(Consumer)
      */
     boolean remove(Object action);
 
@@ -252,16 +253,21 @@
      *
      * @param timeout the maximum time to wait, not {@code null}
      *
+     * @throws IllegalArgumentException if timeout is negative
+     * @throws InterruptedException
+     *
      * @see #start()
      * @see #startAsync()
      */
-    void awaitTermination(Duration timeout);
+    void awaitTermination(Duration timeout) throws InterruptedException;
 
     /**
      * Blocks the current thread until the stream is finished or closed.
      *
+     * @throws InterruptedException
+     *
      * @see #start()
      * @see #startAsync()
      */
-    void awaitTermination();
+    void awaitTermination() throws InterruptedException;
 }
\ No newline at end of file