@@ -51,8 +51,10 @@ func (s *TagStore) Images(filterArgs, filter string, all bool) ([]*types.Image,

 	if i, ok := imageFilters["dangling"]; ok {

 		for _, value := range i {

-			if strings.ToLower(value) == "true" {

+			if v := strings.ToLower(value); v == "true" {

 				filtTagged = false

+			} else if v != "false" {

+				return nil, fmt.Errorf("Invalid filter 'dangling=%s'", v)

 			}

 		}

 	}

@@ -7,6 +7,7 @@ import (

 	"strings"

 	"time"

+	"github.com/docker/docker/pkg/integration/checker"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/go-check/check"

 )

@@ -197,3 +198,9 @@ func (s *DockerSuite) TestImagesEnsureDanglingImageOnlyListedOnce(c *check.C) {

 		c.Fatalf("expected 1 dangling image, got %d: %s", a, out)

 	}

 }

+

+func (s *DockerSuite) TestImagesWithIncorrectFilter(c *check.C) {

+	out, _, err := dockerCmdWithError("images", "-f", "dangling=invalid")

+	c.Assert(err, check.NotNil)

+	c.Assert(out, checker.Contains, "Invalid filter")

+}