diff --git a/jsystem-core-projects/jsystemCore/src/main/java/jsystem/framework/scenario/ScenarioHelpers.java b/jsystem-core-projects/jsystemCore/src/main/java/jsystem/framework/scenario/ScenarioHelpers.java
index 04271ca9..c0bd3c76 100644
--- a/jsystem-core-projects/jsystemCore/src/main/java/jsystem/framework/scenario/ScenarioHelpers.java
+++ b/jsystem-core-projects/jsystemCore/src/main/java/jsystem/framework/scenario/ScenarioHelpers.java
@@ -653,7 +653,7 @@ private static void removeRunningPropsWithDefaultValues(
 			}
 		}
 	}
-
+	
 	public static Properties removeDeletedScenarioProperties(Properties properties, String scenarioName) throws Exception {
 		String lastTestFullUuid = "";
 		Properties sortedProperties = new SortedProperties();
@@ -664,6 +664,9 @@ public static Properties removeDeletedScenarioProperties(Properties properties,
 			if (sortedProperties.get(key1) == null) {
 				continue;
 			}
+			if (key1.toString().indexOf(".") == -1) {
+				continue;
+			}
 			String testFullUuid = key1.toString().substring(0, key1.toString().indexOf("."));
 			if (!testFullUuid.equals(lastTestFullUuid)) {
 				lastTestFullUuid = testFullUuid;