diff --git a/forms/CompositeField.php b/forms/CompositeField.php
index f47d3aa2e..3bd6e9d34 100644
--- a/forms/CompositeField.php
+++ b/forms/CompositeField.php
@@ -47,13 +47,14 @@ class CompositeField extends FormField {
 		if($children instanceof FieldList) {
 			$this->children = $children;
 		} elseif(is_array($children)) {
-			$this->children = new FieldList($children); 
+			$this->children = new FieldList($children);
 		} else {
-			$children = is_array(func_get_args()) ? func_get_args() : array();
-			$this->children = new FieldList($children); 
+			//filter out null/empty items
+			$children = array_filter(func_get_args());
+			$this->children = new FieldList($children);
 		}
 		$this->children->setContainerField($this);
-		
+
 		// Skipping FormField::__construct(), but we have to make sure this
 		// doesn't count as a broken constructor
 		$this->brokenOnConstruct = false;