From 68958fe3e37be74e7559e26cd0ff5beb26de1056 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Fri, 6 Jun 2014 14:38:43 +0530
Subject: [PATCH] Fixes #69

---
 .../processing/mode/experimental/ASTGenerator.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java
index d4fdbff31..3e9d60806 100644
--- a/pdex/src/processing/mode/experimental/ASTGenerator.java
+++ b/pdex/src/processing/mode/experimental/ASTGenerator.java
@@ -1684,7 +1684,7 @@ public class ASTGenerator {
         } else {
           logE("null");
           if(scrollOnly) {
-            editor.statusMessage("Can't find definition of " + simpName,
+            editor.statusMessage(simpName + " is not defined in this sketch",
                                  DebugEditor.STATUS_ERR);
           }
         }
@@ -2310,6 +2310,15 @@ public class ASTGenerator {
                          DebugEditor.STATUS_WARNING);
       return;
     }
+    
+    DefaultMutableTreeNode defCU = findAllOccurrences();   
+    String selText = lastClickedWord == null ? editor.ta.getSelectedText()
+        : lastClickedWord;
+    if(defCU == null){
+      editor.statusMessage(selText + " isn't defined in this sketch, so it can't" +
+      		" be renamed", DebugEditor.STATUS_ERR);
+      return;
+    }
     if (!frmRename.isVisible()){
       frmRename.setLocation(editor.getX()
                             + (editor.getWidth() - frmRename.getWidth()) / 2,