diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.cc b/webrtc/modules/video_coding/main/source/generic_decoder.cc
index 07663e1..cb0faf9 100644
--- a/webrtc/modules/video_coding/main/source/generic_decoder.cc
+++ b/webrtc/modules/video_coding/main/source/generic_decoder.cc
@@ -58,7 +58,12 @@
             _timestampMap.Pop(decodedImage.timestamp()));
         callback = _receiveCallback;
     }
-    assert(frameInfo != NULL);
+
+    if (frameInfo == NULL) {
+      LOG(LS_WARNING) << "Too many frames backed up in the decoder, dropping "
+                         "this one.";
+      return WEBRTC_VIDEO_CODEC_OK;
+    }
 
     _timing.StopDecodeTimer(
         decodedImage.timestamp(),