diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index b2fcc89045ff7..c1ffe7840d9eb 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -107,9 +107,8 @@ class SparkEnv (
         outputCommitCoordinator.stop()
         rpcEnv.shutdown()
       } catch {
-        case e: ServerStateException =>
-          logInfo("Exception while SparkEnv stop", e)
         case NonFatal(e) =>
+          logInfo("Exception while SparkEnv stop", e)
           throw e;
       }