diff --git a/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql b/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql
index cdda9126b5..1319b5b60c 100644
--- a/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql	
+++ b/samples/features/epm-framework/5.0/0Setup Scripts/EPM_Create_Database_Objects.sql	
@@ -577,7 +577,11 @@ SELECT PolicyHistoryID
 	, EvaluatedServer
 	, EvaluationDateTime
 	, EvaluatedPolicy
-	, RIGHT(EvaluatedObject, CHARINDEX('\', REVERSE(EvaluatedObject)) - 1)	
+	, CASE WHEN CHARINDEX('\', REVERSE(EvaluatedObject)) >0 
+		THEN RIGHT(EvaluatedObject,CHARINDEX('\', REVERSE(EvaluatedObject)) - 1) 
+		ELSE EvaluatedObject 
+		END 
+	AS EvaluatedObject
 	, ExceptionMessage
 	, policy_id
 	, CategoryName