diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index ee133dd5e7fd7eef3115b7804d2bb9ae3fd97d1f..7fc0d35ba4767379fcff1606f499fc2e1ba383a4 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8182,15 +8182,18 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
         }
 
         public void mousePressed(MouseEvent e) {
-        	activetdp.tdmm.setSelection(-1, -1);
+        	if (activetdp != null)
+        		activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
         public void mouseReleased(MouseEvent e) {
-        	activetdp.tdmm.setSelection(-1, -1);
+        	if (activetdp != null)
+        		activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
         public void mouseClicked(MouseEvent e) {
-        	activetdp.tdmm.setSelection(-1, -1);
+        	if (activetdp != null)
+        		activetdp.tdmm.setSelection(-1, -1);
             checkForPopup(e);
         }
 
diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java
index b4f9cefc1e8724dd0d01178bd49a3d2c840ad129..3cd707e5151e401b0bdd41f43e75c90f3750e5a1 100755
--- a/src/main/java/ui/TURTLEPanelPopupListener.java
+++ b/src/main/java/ui/TURTLEPanelPopupListener.java
@@ -75,17 +75,20 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
     }
 
     public void mousePressed(MouseEvent e) {
-    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+    	if (mgui.getCurrentTDiagramPanel() != null)
+    		mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }
     
     public void mouseReleased(MouseEvent e) {
-    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+    	if (mgui.getCurrentTDiagramPanel() != null)
+    		mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }
     
     public void mouseClicked(MouseEvent e) {
-    	mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
+    	if (mgui.getCurrentTDiagramPanel() != null)
+    		mgui.getCurrentTDiagramPanel().getMouseManager().setSelection(-1, -1);
         checkForPopup(e);
     }