From b323b92f9afafc0dda0a9faf87e5297aa2f924bc Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Wed, 12 Sep 2018 15:40:49 +0200
Subject: [PATCH] MID-4595 History tab for workflow-related events

---
 .../evolveum/midpoint/gui/api/component/DisplayNamePanel.java   | 2 +-
 .../midpoint/model/impl/controller/AuditController.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
index 05d55ad025a..836badda3ef 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
@@ -88,7 +88,7 @@ private void initLayout() {
 		kindIntent.add(new VisibleBehaviour(() -> isKindIntentVisible(kindIntentLabelModel)));
         add(kindIntent);
         
-        if(getModel().getObject().asPrismContainerValue().contains(ObjectType.F_DESCRIPTION)) {
+        if(getModel().getObject() != null && getModel().getObject().asPrismContainerValue().contains(ObjectType.F_DESCRIPTION)) {
         	add(new Label(ID_DESCRIPTION, new PropertyModel<String>(getModel(), ObjectType.F_DESCRIPTION.getLocalPart())));
         } else {
         	add(new Label(ID_DESCRIPTION, Model.of("")));
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
index b6bdade9bae..a9a52df2dbb 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
@@ -247,7 +247,7 @@ private <O extends ObjectType> boolean isApplicable(ObjectDeltaOperation<? exten
 			PrismObject<O> object, AuditEventRecord lastEvent) {
 		OperationResult executionResult = lastEventDeltasOperation.getExecutionResult();
 		ObjectDelta<O> objectDelta = (ObjectDelta<O>) lastEventDeltasOperation.getObjectDelta();
-		if (executionResult.getStatus() == OperationResultStatus.FATAL_ERROR) {
+		if (executionResult != null && executionResult.getStatus() == OperationResultStatus.FATAL_ERROR) {
 			LOGGER.trace("Skipping delta {} in event {} because it is {}", objectDelta, lastEvent.getEventIdentifier(),
 					executionResult.getStatus());
 			return false;