scikit-learn
diff --git a/‎sklearn/neighbors/base.py‎
Lines changed: 8 additions & 0 deletions b/‎sklearn/neighbors/base.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎sklearn/neighbors/tests/test_neighbors.py‎
Lines changed: 7 additions & 0 deletions b/‎sklearn/neighbors/tests/test_neighbors.py‎
Lines changed: 7 additions & 0 deletions
@@ -258,6 +258,14 @@ def _fit(self, X):
         else:
             raise ValueError("algorithm = '%s' not recognized"
                              % self.algorithm)
+
+        if self.n_neighbors is not None:
+            if self.n_neighbors <= 0:
+                raise ValueError(
+                    "Expected n_neighbors > 0. Got %d" %
+                    self.n_neighbors
+                )
+
         return self
 
 
 
@@ -834,6 +834,13 @@ def test_neighbors_badargs():
         assert_raises(ValueError,
                       nbrs.predict,
                       [])
+        if isinstance(cls, neighbors.KNeighborsClassifier) or \
+                isinstance(cls, neighbors.KNeighborsRegressor):
+            nbrs = cls(n_neighbors=-1)
+            assert_raises(ValueError,
+                      nbrs.fit,
+                      X, y)
+
 
     nbrs = neighbors.NearestNeighbors().fit(X)