diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java
index 82591722bdb..a49d4808e41 100644
--- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java
+++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/AddForeignKeyTask.java
@@ -80,7 +80,18 @@ public class AddForeignKeyTask extends BaseTableColumnTask<AddForeignKeyTask> {
 				sql = "alter table " + getTableName() + " add constraint " + myConstraintName + " foreign key (" + getColumnName() + ") references " + myForeignTableName;
 				break;
 		}
-		executeSql(sql);
+
+
+		try {
+			executeSql(sql);
+		} catch (Exception e) {
+			if (e.toString().contains("already exists")) {
+				ourLog.warn("Index {} already exists", myConstraintName);
+			} else {
+				throw e;
+			}
+		}
+
 	}
 
 }