diff --git a/modules/org.pathvisio.core/src/org/pathvisio/core/model/PathwayElement.java b/modules/org.pathvisio.core/src/org/pathvisio/core/model/PathwayElement.java
index c3c888b8..82154231 100644
--- a/modules/org.pathvisio.core/src/org/pathvisio/core/model/PathwayElement.java
+++ b/modules/org.pathvisio.core/src/org/pathvisio/core/model/PathwayElement.java
@@ -1005,7 +1005,9 @@ public void setStaticProperty(StaticProperty key, Object value)
 			}
 			else
 			{
-				setDataSource(DataSource.getExistingByFullName((String)value));
+				if (DataSource.fullNameExists((String)value)) {
+					setDataSource(DataSource.getExistingByFullName((String)value));
+				}
 			}
 			break;
 		case TYPE: