diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index a4b511b4f0ea0..b2fcc89045ff7 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -107,8 +107,10 @@ class SparkEnv (
         outputCommitCoordinator.stop()
         rpcEnv.shutdown()
       } catch {
-        case NonFatal(e) =>
+        case e: ServerStateException =>
           logInfo("Exception while SparkEnv stop", e)
+        case NonFatal(e) =>
+          throw e;
       }
 
       // Unfortunately Akka's awaitTermination doesn't actually wait for the Netty server to shut