diff --git a/relation_endpoint.module b/relation_endpoint.module
index f583280..0c62341 100644
--- a/relation_endpoint.module
+++ b/relation_endpoint.module
@@ -25,6 +25,9 @@ function relation_endpoint_field_info() {
  * Implements hook_field_validate().
  */
 function relation_endpoint_field_validate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) {
+  if (empty($entity_type) && empty($entity)) {
+    return;
+  }
   $relation_type = relation_type_load($entity->relation_type);
   // Check that relation_type exists.
   if (!$relation_type) {
diff --git a/tests/relation.test b/tests/relation.test
index 6e7f7fc..7f92ff5 100644
--- a/tests/relation.test
+++ b/tests/relation.test
@@ -363,4 +363,16 @@ class RelationAPITestCase extends RelationTestCase {
       $this->assertTrue(array_key_exists($rid, $revision), 'Relation revision created.');
     }
   }
+
+ 
+  /**
+   * Tests endpoint field settings.
+   */
+  function testRelationEndpointsField() {
+    $edit = array(
+      'instance[label]' => 'endpoints new label'
+    );
+    $this->drupalPost('admin/structure/relation/manage/symmetric/fields/endpoints', $edit, t('Save settings'));
+    $this->assertText(t('Saved endpoints new label configuration.'));
+  }
 }