From 428ed940d5f87116a540a507da0c5847eeb8abef Mon Sep 17 00:00:00 2001
From: terrypacker <username@users.noreply.github.com>
Date: Mon, 14 Mar 2016 13:45:57 -1000
Subject: [PATCH] Improved error messages for missing script context variables
 as per issue #632

---
 Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java b/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java
index cb01820144..1361a2c75b 100644
--- a/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java
+++ b/Core/src/com/serotonin/m2m2/rt/script/ScriptExecutor.java
@@ -43,7 +43,7 @@ public Map<String, IDataPointValueSource> convertContext(List<IntStringPair> con
             DataPointRT point = Common.runtimeManager.getDataPoint(contextEntry.getKey());
             if (point == null)
                 throw new DataPointStateException(contextEntry.getKey(), new TranslatableMessage(
-                        "event.meta.pointMissing"));
+                        "event.meta.pointMissing", contextEntry.getValue(), contextEntry.getKey()));
             converted.put(contextEntry.getValue(), point);
         }
 
@@ -62,7 +62,7 @@ public static Map<String, IDataPointValueSource> convertScriptContext(List<Scrip
             DataPointRT point = Common.runtimeManager.getDataPoint(contextEntry.getDataPointId());
             if (point == null)
                 throw new DataPointStateException(contextEntry.getDataPointId(), new TranslatableMessage(
-                        "event.meta.pointMissing"));
+                        "event.meta.pointMissing", contextEntry.getVariableName(), contextEntry.getDataPointId()));
             converted.put(contextEntry.getVariableName(), point);
         }