diff --git a/nodes/core/core/89-trigger.js b/nodes/core/core/89-trigger.js
index f1df7ea8b..49860135e 100644
--- a/nodes/core/core/89-trigger.js
+++ b/nodes/core/core/89-trigger.js
@@ -120,7 +120,10 @@ module.exports = function(RED) {
                                 if (node.op2type === "flow" || node.op2type === "global") {
                                     node.topics[topic].m2 = RED.util.evaluateNodeProperty(node.op2,node.op2type,node,msg);
                                 }
-                                msg2.payload = node.topics[topic].m2;
+                                if (node.topics.hasOwnProperty(topic)) {
+                                    msg2.payload = node.topics[topic].m2;
+                                }
+                                else { node.error("No topic:"+topic,msg); }  // temporary fix to try to get more data.
                             }
                             delete node.topics[topic];
                             node.status({});