SERVER-4843

2 files changed, 7 insertions, 6 deletions

diff --git a/src/mongo/db/pipeline/accumulator.cpp b/src/mongo/db/pipeline/accumulator.cpp
index 42dc5c1334a..64c983c5e2d 100755
--- a/src/mongo/db/pipeline/accumulator.cpp
+++ b/src/mongo/db/pipeline/accumulator.cpp
@@ -56,8 +56,6 @@ namespace mongo {
     }

 

     void agg_framework_reservedErrors() {

-        uassert(15956, "reserved error", false);

-

         uassert(16028, "reserved error", false);

         uassert(16029, "reserved error", false);

         uassert(16030, "reserved error", false);

diff --git a/src/mongo/db/pipeline/document_source_skip.cpp b/src/mongo/db/pipeline/document_source_skip.cpp
index 605f85e7f92..6831795cf21 100644
--- a/src/mongo/db/pipeline/document_source_skip.cpp
+++ b/src/mongo/db/pipeline/document_source_skip.cpp
@@ -107,14 +107,17 @@ namespace mongo {
     intrusive_ptr<DocumentSource> DocumentSourceSkip::createFromBson(
         BSONElement *pBsonElement,
         const intrusive_ptr<ExpressionContext> &pExpCtx) {
-        uassert(15972, str::stream() << "the value to " <<
-                skipName << " must be a number", pBsonElement->isNumber());
+        uassert(15972, str::stream() << DocumentSourceSkip::skipName <<
+                ":  the value to skip must be a number",
+                pBsonElement->isNumber());
 
         intrusive_ptr<DocumentSourceSkip> pSkip(
             DocumentSourceSkip::create(pExpCtx));
 
-        pSkip->skip = (int)pBsonElement->numberLong();
-        assert(pSkip->skip > 0); // CW TODO error code
+        pSkip->skip = pBsonElement->numberLong();
+        uassert(15956, str::stream() << DocumentSourceSkip::skipName <<
+                ":  the number to skip cannot be negative",
+                pSkip->skip >= 0);
 
         return pSkip;
     }