diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee
index 713162d9..bb62cb60 100644
--- a/app/coffee/modules/common/confirm.coffee
+++ b/app/coffee/modules/common/confirm.coffee
@@ -169,20 +169,21 @@ class ConfirmService extends taiga.Service
         el.find("img").remove()
         el.find("svg").remove()
 
-        if icon.type == "img"
-            detailImage = $('<img>').addClass('lb-icon').attr('src', icon.name)
-        else if icon.type == "svg"
-            useSVG = document.createElementNS('http://www.w3.org/2000/svg', 'use')
-            useSVG.setAttributeNS('http://www.w3.org/1999/xlink','href', '#' + icon.name)
+        if icon
+            if icon.type == "img"
+                detailImage = $('<img>').addClass('lb-icon').attr('src', icon.name)
+            else if icon.type == "svg"
+                useSVG = document.createElementNS('http://www.w3.org/2000/svg', 'use')
+                useSVG.setAttributeNS('http://www.w3.org/1999/xlink','href', '#' + icon.name)
 
-            detailImage = document.createElementNS("http://www.w3.org/2000/svg", "svg")
-            detailImage.classList.add("icon")
-            detailImage.classList.add("lb-icon")
-            detailImage.classList.add(icon.name)
-            detailImage.appendChild(useSVG)
+                detailImage = document.createElementNS("http://www.w3.org/2000/svg", "svg")
+                detailImage.classList.add("icon")
+                detailImage.classList.add("lb-icon")
+                detailImage.classList.add(icon.name)
+                detailImage.appendChild(useSVG)
 
-        if detailImage
-            el.find('section').prepend(detailImage)
+            if detailImage
+                el.find('section').prepend(detailImage)
 
         # Render content
         el.find(".title").html(title) if title
diff --git a/e2e/utils/notifications.js b/e2e/utils/notifications.js
index 07719154..d5d42e10 100644
--- a/e2e/utils/notifications.js
+++ b/e2e/utils/notifications.js
@@ -77,3 +77,17 @@ notifications.errorLight.open = function() {
             });
         });
 };
+
+notifications.errorLight.close = function() {
+    var el = $('.notification-message-light-error');
+
+    return browser
+        .wait(function() {
+            return common.hasClass(el, 'inactive');
+        }, 4000)
+        .then(function(active) {
+            return browser.sleep(transition).then(function() {
+                return active;
+            });
+        });
+};