Merge pull request #86 from lwander/npe-app-save

core: NPE thrown while reporting save error
spinnaker · May 10, 2016 · 0a9bc1c · 0a9bc1c
2 parents a277d8a + 87b2862
commit 0a9bc1c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...0-core/src/main/groovy/com/netflix/spinnaker/front50/model/application/Application.groovy b/...0-core/src/main/groovy/com/netflix/spinnaker/front50/model/application/Application.groovy
@@ -275,7 +275,7 @@ class Application implements Timestamped {
         log.error("Rollback failed (onRollback)", rollbackException)
       }
 
-      log.error("Failed to perform action (name: ${originalApplication.name ?: updatedApplication.name})")
+      log.error("Failed to perform action (name: ${originalApplication?.name ?: updatedApplication?.name})")
       throw e
     }
   }