diff --git a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
index d075c0116e89b10b9c09625e03cce5fad516900b..62ebe235f1867da26bdbfcb55b697c47c5bf50fa 100644
--- a/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
+++ b/src/main/java/net/geant/nmaas/nmservice/deployment/containerorchestrators/kubernetes/components/helm/HelmChartUpdateListener.java
@@ -26,7 +26,7 @@ public class HelmChartUpdateListener {
     @Loggable(LogLevel.INFO)
     public ApplicationEvent trigger(ApplicationListUpdatedEvent event) {
         // add Helm repository from KubernetesTemplate (it will be overwritten if already exists)
-        if (Arrays.asList(ADDED, UPDATED).contains(event.getAction())) {
+        if (Arrays.asList(ADDED, UPDATED).contains(event.getAction()) && event.getDeploymentSpec() != null) {
             String repoName = event.getDeploymentSpec().getKubernetesTemplate().getHelmChartRepository().getName();
             String repoUrl = event.getDeploymentSpec().getKubernetesTemplate().getHelmChartRepository().getUrl();
             if (StringUtils.hasText(repoName) && StringUtils.hasText(repoUrl)) {
diff --git a/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java b/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
index 7cba66f40845b56e1ec05b4b917f4a49a8dfc7a7..7e171535a344f0a099d708ff5a05de3cc893e10d 100644
--- a/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
+++ b/src/main/java/net/geant/nmaas/portal/events/ApplicationListUpdatedEvent.java
@@ -26,4 +26,11 @@ public class ApplicationListUpdatedEvent extends ApplicationEvent {
         DELETED;
     }
 
+    @Override
+    public String toString() {
+        return "ApplicationListUpdatedEvent{" +
+                "name=" + name + ", version=" + version + ", action=" + action + ", deploymentSpec=" + ((deploymentSpec != null) ? "provided" : "empty") +
+                '}';
+    }
+
 }