diff --git a/src/main/scala/com/twitter/querulous/query/SqlQuery.scala b/src/main/scala/com/twitter/querulous/query/SqlQuery.scala
index c81ebeb..60577ca 100644
--- a/src/main/scala/com/twitter/querulous/query/SqlQuery.scala
+++ b/src/main/scala/com/twitter/querulous/query/SqlQuery.scala
@@ -109,6 +109,7 @@ class SqlQuery(connection: Connection, query: String, params: Any*) extends Quer
         m.appendReplacement(result, questionMarks)
       } catch {
         case e: ArrayIndexOutOfBoundsException => throw new TooFewQueryParametersException
+        case e: NoSuchElementException => throw new TooFewQueryParametersException
       }
       i += 1
     }