diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 1bc52d198080e..9a77d4a4afb2e 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -211,7 +211,6 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
 
     // In client mode the actor will stop the reporter thread.
     reporterThread.join()
-    finalStatus = FinalApplicationStatus.SUCCEEDED
   }
 
   private def launchReporterThread(): Thread = {
@@ -412,7 +411,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
         }
         catch {
           case e: SecurityException =>
-            logError("setSecurityManager:", e)
+            logError("Error in setSecurityManager:", e)
         }
 
         Utils.tryOrExit {