diff --git a/skimage/measure/find_contours.py b/skimage/measure/find_contours.py
index eafbd523..3a546ccf 100755
--- a/skimage/measure/find_contours.py
+++ b/skimage/measure/find_contours.py
@@ -98,7 +98,7 @@ def find_contours(array, level,
     """
     array = np.asarray(array, dtype=np.double)
     if array.ndim != 2:
-        raise TypeError('Only 2D arrays are supported.')
+        raise ValueError('Only 2D arrays are supported.')
     level = float(level)
     if (fully_connected not in _param_options or
        positive_orientation not in _param_options):
diff --git a/skimage/measure/tests/test_find_contours.py b/skimage/measure/tests/test_find_contours.py
index cde60e4d..11b9b443 100644
--- a/skimage/measure/tests/test_find_contours.py
+++ b/skimage/measure/tests/test_find_contours.py
@@ -75,7 +75,7 @@ def test_memory_order():
 
 def test_invalid_input():
     assert_raises(ValueError, find_contours, r, 0.5, 'foo', 'bar')
-    assert_raises(TypeError, find_contours, r[..., None], 0.5)
+    assert_raises(ValueError, find_contours, r[..., None], 0.5)
 
 
 if __name__ == '__main__':