--- a/src/java.base/share/classes/java/net/ServerSocket.java	Fri May 24 15:14:12 2019 +0100
+++ b/src/java.base/share/classes/java/net/ServerSocket.java	Wed May 29 20:58:35 2019 +0100
@@ -1025,6 +1025,9 @@
     public <T> ServerSocket setOption(SocketOption<T> name, T value)
         throws IOException
     {
+        Objects.requireNonNull(name);
+        if (isClosed())
+            throw new SocketException("Socket is closed");
         getImpl().setOption(name, value);
         return this;
     }
@@ -1053,6 +1056,9 @@
      * @since 9
      */
     public <T> T getOption(SocketOption<T> name) throws IOException {
+        Objects.requireNonNull(name);
+        if (isClosed())
+            throw new SocketException("Socket is closed");
         return getImpl().getOption(name);
     }