diff --git a/engine/merge.go b/engine/merge.go
index ffe4f9a3fb4..642f96f790a 100644
--- a/engine/merge.go
+++ b/engine/merge.go
@@ -52,7 +52,10 @@ func getJoinYield(query *parser.SelectQuery, yield func(*protocol.Series) error)
 		lastPoint1 = nil
 		lastPoint2 = nil
 
-		filteredSeries, _ := Filter(query, newSeries)
+		filteredSeries, err := Filter(query, newSeries)
+		if err != nil {
+			return err
+		}
 		if len(filteredSeries.Points) > 0 {
 			return yield(newSeries)
 		}
diff --git a/integration/data_test.go b/integration/data_test.go
index 2e723c66e89..dd3af4d67d0 100644
--- a/integration/data_test.go
+++ b/integration/data_test.go
@@ -570,6 +570,32 @@ func (self *DataTestSuite) JoinAndArithmetic(c *C) (Fun, Fun) {
 		}
 }
 
+// issue #652
+func (self *DataTestSuite) JoinWithInvalidFilteringShouldReturnMeaningfulError(c *C) (Fun, Fun) {
+	return func(client Client) {
+			t1 := time.Now().Truncate(time.Hour).Add(-4 * time.Hour)
+			t2 := t1.Add(time.Hour)
+			t3 := t2.Add(time.Hour)
+			t4 := t3.Add(time.Hour)
+			data := fmt.Sprintf(`[
+{
+  "name":"foo",
+  "columns":["time", "val"],
+  "points":[[%d, 1],[%d, 2]]
+},
+{
+  "name":"bar",
+  "columns":["time", "val"],
+  "points":[[%d, 3],[%d, 4]]
+
+}]`, t1.Unix(), t3.Unix(), t2.Unix(), t4.Unix())
+			client.WriteJsonData(data, c, "s")
+		}, func(client Client) {
+			s := client.RunQuery("select foo.val + bar.val from foo inner join bar where val <> 3", c, "m")
+			c.Assert(s, HasLen, 0)
+		}
+}
+
 // issue #540
 func (self *DataTestSuite) RegexMatching(c *C) (Fun, Fun) {
 	return func(client Client) {