diff --git a/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java b/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java
index 74479d4..4880216 100755
--- a/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java
+++ b/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java
@@ -71,7 +71,7 @@ public List<NextBuilds> getBuilds() {
         Jenkins j = Jenkins.getInstanceOrNull();
 
         if (j == null) {
-            return null;
+            return nblist;
         }
 
         DescriptorImpl d = (DescriptorImpl) (j.getDescriptorOrDie(NextBuilds.class));
@@ -129,10 +129,6 @@ else if (getShowParameterizedWidget()) {
         return nblist;
     }
 
-    public String getWidgetEmptyMessage() {
-        return Messages.NextExec_EmptyWidgetMessage();
-    }
-
     public String getWidgetName() {
         return Messages.NextExec_WidgetName();
     }
diff --git a/src/main/resources/hudson/plugins/nextexecutions/Messages.properties b/src/main/resources/hudson/plugins/nextexecutions/Messages.properties
index bc35ead..9a8ee52 100755
--- a/src/main/resources/hudson/plugins/nextexecutions/Messages.properties
+++ b/src/main/resources/hudson/plugins/nextexecutions/Messages.properties
@@ -1,7 +1,6 @@
 Format.Error=The date format pattern is not valid.
 timeToGo=(in {0})
 NextExec.WidgetName=Next Executions
-NextExec.EmptyWidgetMessage=No next executions found
 NextExecComputer.WidgetName=Next Executions tied to this agent
 PossibleNextExec.WidgetName=Possible Next Executions
 ParameterizedExec.WidgetName=Parameterized Next Executions
diff --git a/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly b/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly
index 2412ed8..8d0f638 100755
--- a/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly
+++ b/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly
@@ -2,19 +2,12 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <j:if test="${it.showWidget()}">
   <l:pane width="2" title="${it.widgetName}" id="${it.widgetId}">
-    <j:if test="${it.builds() == null}"> 
+    <j:forEach var="w" items="${it.builds}">
       <tr>
-        <td class="pane">${it.widgetEmptyMessage}</td>
+        <td class="pane"><a tooltip="${w.name}" href="${w.url}">${w.name}</a></td>
+        <td class="pane" tooltip="${w.timeToGo}">${w.date}</td>
       </tr>
-    </j:if>
-    <j:if test="${it.builds() != null}">
-      <j:forEach var="w" items="${it.builds}">
-        <tr>
-          <td class="pane"><a tooltip="${w.name}" href="${w.url}">${w.name}</a></td>
-          <td class="pane" tooltip="${w.timeToGo}">${w.date}</td>
-        </tr>
-      </j:forEach>
-    </j:if>
+    </j:forEach>
   </l:pane>
 </j:if>
 </j:jelly>