diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index a1f04d3..61bb2a8 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -701,12 +701,11 @@
         return;
     }
 
-    if (mNumFramesReceived > 0 &&
-        timestampUs - mLastFrameTimestampUs > mGlitchDurationThresholdUs) {
-        if (mNumGlitches % 10 == 0) {  // Don't spam the log
-            LOGV("Long delay detected in video recording");
+    if (mNumFramesReceived > 0) {
+        CHECK(timestampUs > mLastFrameTimestampUs);
+        if (timestampUs - mLastFrameTimestampUs > mGlitchDurationThresholdUs) {
+            ++mNumGlitches;
         }
-        ++mNumGlitches;
     }
 
     // May need to skip frame or modify timestamp. Currently implemented
@@ -732,6 +731,7 @@
     }
     ++mNumFramesReceived;
 
+    CHECK(data != NULL && data->size() > 0);
     mFramesReceived.push_back(data);
     int64_t timeUs = mStartTimeUs + (timestampUs - mFirstFrameTimeUs);
     mFrameTimes.push_back(timeUs);