diff --git a/src/applications/conduit/parametertype/ConduitParameterType.php b/src/applications/conduit/parametertype/ConduitParameterType.php
index 6468b099a0..011401433e 100644
--- a/src/applications/conduit/parametertype/ConduitParameterType.php
+++ b/src/applications/conduit/parametertype/ConduitParameterType.php
@@ -38,6 +38,9 @@ abstract class ConduitParameterType extends Phobject {
     return $this->getParameterValue($request, $key);
   }
 
+  final public function getKeys($key) {
+    return $this->getParameterKeys($key);
+  }
 
   final public function getDefaultValue() {
     return $this->getParameterDefault();
@@ -86,6 +89,10 @@ abstract class ConduitParameterType extends Phobject {
     return $request[$key];
   }
 
+  protected function getParameterKeys($key) {
+    return array($key);
+  }
+
   abstract protected function getParameterTypeName();
 
 
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index d2ce3ad946..13606c542f 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1094,6 +1094,22 @@ abstract class PhabricatorApplicationSearchEngine extends Phobject {
       }
     }
 
+    $valid_constraints = array();
+    foreach ($fields as $field) {
+      foreach ($field->getValidConstraintKeys() as $key) {
+        $valid_constraints[$key] = true;
+      }
+    }
+
+    foreach ($constraints as $key => $constraint) {
+      if (empty($valid_constraints[$key])) {
+        throw new Exception(
+          pht(
+            'Constraint "%s" is not a valid constraint for this query.',
+            $key));
+      }
+    }
+
     foreach ($fields as $field) {
       if (!$field->getValueExistsInConduitRequest($constraints)) {
         continue;
diff --git a/src/applications/search/field/PhabricatorSearchField.php b/src/applications/search/field/PhabricatorSearchField.php
index 9624fe22f9..d31aeb1950 100644
--- a/src/applications/search/field/PhabricatorSearchField.php
+++ b/src/applications/search/field/PhabricatorSearchField.php
@@ -329,6 +329,11 @@ abstract class PhabricatorSearchField extends Phobject {
       $this->getConduitKey());
   }
 
+  public function getValidConstraintKeys() {
+    return $this->getConduitParameterType()->getKeys(
+      $this->getConduitKey());
+  }
+
 
 /* -(  Utility Methods )----------------------------------------------------- */