diff --git a/forms/FieldList.php b/forms/FieldList.php
index 9f4aaec6c..b7e535d6d 100644
--- a/forms/FieldList.php
+++ b/forms/FieldList.php
@@ -130,7 +130,7 @@ class FieldList extends ArrayList {
 			// Check if a field by the same name exists in this tab
 			if($insertBefore) {
 				$tab->insertBefore($field, $insertBefore);
-			} elseif($tab->fieldByName($field->getName())) {
+			} elseif(($name = $field->getName()) && $tab->fieldByName($name)) {
 				// It exists, so we need to replace the old one
 				$this->replaceField($field->getName(), $field);
 			} else {
diff --git a/tests/forms/FieldListTest.php b/tests/forms/FieldListTest.php
index 8e4afc779..0496ca905 100644
--- a/tests/forms/FieldListTest.php
+++ b/tests/forms/FieldListTest.php
@@ -48,6 +48,43 @@ class FieldListTest extends SapphireTest {
 		/* We'll have 3 fields inside the tab */
 		$this->assertEquals(3, $tab->Fields()->Count());
 	}
+	
+	/**
+	 * Test that groups can be added to a fieldlist
+	 */
+	public function testFieldgroup() {
+		$fields = new FieldList();
+		$tab = new Tab('Root');
+		$fields->push($tab);
+		
+		$fields->addFieldsToTab('Root', array(
+			$group1 = new FieldGroup(
+				new TextField('Name'),
+				new EmailField('Email')
+			),
+			$group2 = new FieldGroup(
+				new TextField('Company'),
+				new TextareaField('Address')
+			)
+		));
+		
+		/* Check that the field objects were created */
+		$this->assertNotNull($fields->dataFieldByName('Name'));
+		$this->assertNotNull($fields->dataFieldByName('Email'));
+		$this->assertNotNull($fields->dataFieldByName('Company'));
+		$this->assertNotNull($fields->dataFieldByName('Address'));
+		
+		/* The field objects in the set should be the same as the ones we created */
+		$this->assertSame($fields->dataFieldByName('Name'), $group1->fieldByName('Name'));
+		$this->assertSame($fields->dataFieldByName('Email'), $group1->fieldByName('Email'));
+		$this->assertSame($fields->dataFieldByName('Company'), $group2->fieldByName('Company'));
+		$this->assertSame($fields->dataFieldByName('Address'), $group2->fieldByName('Address'));
+		
+		/* We'll have 2 fields directly inside the tab */
+		$this->assertEquals(2, $tab->Fields()->Count());
+		
+		
+	}
 		
 	/**
 	 * Test removing a single field from a tab in a set.