diff --git a/EditArtistPanel.java b/EditArtistPanel.java
index 91e4cc8..3620010 100644
--- a/EditArtistPanel.java
+++ b/EditArtistPanel.java
@@ -94,7 +94,7 @@ public class EditArtistPanel extends JFrame{
 				boolean alreadyExists = false;
 				for (Artist artist : agenda.getArtists())
 				{
-					if (artist.getName().equals(name))
+					if (artist.getName().equals(name) && !artist.equals(art))
 					{
 						alreadyExists = true;
 					}
diff --git a/EditStagePanel.java b/EditStagePanel.java
index 9cdb32b..b87a7d0 100644
--- a/EditStagePanel.java
+++ b/EditStagePanel.java
@@ -60,7 +60,7 @@ public class EditStagePanel extends JFrame{
 				boolean alreadyExists = false;
 				for (Stage stage : agenda.getStages())
 				{
-					if (stage.getName().equals(name))
+					if (stage.getName().equals(name)  && !stage.equals(sta))
 					{
 						alreadyExists = true;
 					}