diff --git a/suncron.html b/suncron.html
index d3e70a6..8a18e5b 100644
--- a/suncron.html
+++ b/suncron.html
@@ -1216,7 +1216,7 @@ <h3>Sun event outputs</h3>
           <span class="property-type">obj</span>
         </dt>
         <dt>msg.next
-          <span class="property-type">string</span>
+          <span class="property-type">obj</span>
         </dt>
       </dl>
     <h4>Details</h4>
@@ -1261,7 +1261,7 @@ <h5>Example <code>msg.schedule</code> object</h5>
     </pre>
     <h4>Next</h4>
     <p>
-      The <code>msg.next</code> attribute contains a string hinting at the next upcoming event, e.g. &quot;sunsetStart @ 21:29&quot;
+      The <code>msg.next</code> attribute contains the event object of the schedule which is coming up next.
     </p>
     <h3>Schedule event outputs</h3>
     <p>
diff --git a/suncron.js b/suncron.js
index 2e0fec3..9f47209 100644
--- a/suncron.js
+++ b/suncron.js
@@ -266,19 +266,22 @@ module.exports = function (RED) {
         }
       }
 
-      let nextEvent
+      let next
 
       try {
         nextEvent = findNextEvent(schedule)
+        console.log('schedule', schedule)
+        console.log('nextEvent', nextEvent)
+        next = schedule[nextEvent.eventName]
       } catch (e) {
-        nextEvent = e.message
+        next = null
       }
 
       node.send({
         topic,
         payload: castPayload(payload, payloadType),
         schedule: formatSchedule(schedule),
-        next: `${nextEvent.eventName} @ ${nextEvent.eventTime.format('HH:mm')}`,
+        next,
       })
     }