diff --git a/server/src/main/java/com/exacaster/lighter/application/ApplicationStatusHandler.java b/server/src/main/java/com/exacaster/lighter/application/ApplicationStatusHandler.java
index a55f5d2f..99556add 100644
--- a/server/src/main/java/com/exacaster/lighter/application/ApplicationStatusHandler.java
+++ b/server/src/main/java/com/exacaster/lighter/application/ApplicationStatusHandler.java
@@ -51,16 +51,7 @@ public ApplicationState processApplicationRunning(Application app) {
     }
 
     public void processApplicationError(Application application, Throwable error) {
-        // Workaround for case when Spark launcher logs
-        // `DEBUG Configuration: Handling deprecation for hive.stats.ndv.error`
-        // on org.apache.spark.launcher.OutputRedirector#redirect() it marks all stdout lines
-        // containing `error` string as Exceptions.
-        if (error.getMessage().contains("hive.stats.ndv.error")) {
-            LOG.debug("Skipping", error);
-            return;
-        }
-
-        LOG.warn("Application {} error occurred", application, error);
+        LOG.warn("Marking application {} failed because of error {}", application.getId(), error.getMessage());
         var appId = backend.getInfo(application).map(ApplicationInfo::getApplicationId)
                 .orElse(null);
         applicationStorage.saveApplication(
diff --git a/server/src/main/java/com/exacaster/lighter/spark/SparkListener.java b/server/src/main/java/com/exacaster/lighter/spark/SparkListener.java
index ce327d8e..56e3e9ab 100644
--- a/server/src/main/java/com/exacaster/lighter/spark/SparkListener.java
+++ b/server/src/main/java/com/exacaster/lighter/spark/SparkListener.java
@@ -25,8 +25,12 @@ public SparkListener(Consumer<Throwable> errorHandler) {
     public void stateChanged(SparkAppHandle handle) {
         var state = handle.getState();
         LOG.info("State change. AppId: {}, State: {}", handle.getAppId(), state);
-        handle.getError().ifPresent(errorHandler);
-
+        handle.getError().ifPresent((error) -> {
+            LOG.warn("State changed with error: {} ", error.getMessage());
+            if (State.FAILED.equals(state)) {
+                errorHandler.accept(error);
+            }
+        });
         // Disconnect when final or submitted.
         // In case app fails after detach, status will be retrieved by ApplicationStatusHandler.
         if (state != null && (state.isFinal() || State.SUBMITTED.equals(state))) {