diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
index 7620e2e2..5942f8e6 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt
@@ -87,20 +87,21 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 	}
 
 	override fun isValidForSave(): Boolean {
-		return true
-	}
-
-	override fun alreadyExists(realm: Realm): Boolean {
-		return realm.where(this::class.java).equalTo("name", this.name).and().notEqualTo("id", this.id).findAll().isNotEmpty()
+		return super.isValidForSave()
 	}
 
 	override fun getFailedSaveMessage(status: SaveValidityStatus): Int {
 		return when (status) {
 			SaveValidityStatus.DATA_INVALID -> R.string.cf_empty_field_error
+			SaveValidityStatus.ALREADY_EXISTS -> R.string.duplicate_cf_error
 			else -> super.getFailedSaveMessage(status)
 		}
 	}
 
+	override fun alreadyExists(realm: Realm): Boolean {
+		return realm.where(this::class.java).equalTo("name", this.name).and().notEqualTo("id", this.id).findAll().isNotEmpty()
+	}
+
 	override fun isValidForDelete(realm: Realm): Boolean {
 		return true
 	}