--- a/media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc
@@ -12,16 +12,17 @@
 
 #include <stdio.h>
 
 #include "critical_section_wrapper.h"
 #include "ref_count.h"
 #include "trace.h"
 
 #include "AndroidJNIWrapper.h"
+#include "mozilla/Assertions.h"
 
 namespace webrtc
 {
 #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
 // TODO(leozwang) These SetAndroidVM apis will be refactored, thus we only
 // keep and reference java vm.
 int32_t SetCaptureAndroidVM(void* javaVM, void* javaContext) {
   return videocapturemodule::VideoCaptureAndroid::SetAndroidObjects(
@@ -63,16 +64,18 @@ jclass VideoCaptureAndroid::g_javaCmDevI
 jobject VideoCaptureAndroid::g_javaCmDevInfoObject = NULL;
 
 /*
  * Register references to Java Capture class.
  */
 int32_t VideoCaptureAndroid::SetAndroidObjects(void* javaVM,
                                                void* javaContext) {
 
+  MOZ_ASSERT(javaVM != nullptr || g_javaCmDevInfoClass != nullptr);
+
   g_jvm = static_cast<JavaVM*> (javaVM);
 
   if (javaVM) {
     // Already done? Exit early.
     if (g_javaCmClass != NULL
         && g_javaCmDevInfoClass != NULL
         && g_javaCmDevInfoObject != NULL) {
         return 0;
@@ -219,16 +222,18 @@ int32_t VideoCaptureAndroid::AttachAndUs
     if ((res < 0) || !env) {
       WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, -1,
                    "%s: Could not attach thread to JVM (%d, %p)",
                    __FUNCTION__, res, env);
       return -1;
     }
     attached = true;
   }
+  MOZ_ASSERT(g_javaCmDevInfoClass != nullptr);
+  MOZ_ASSERT(g_javaCmDevInfoObject != nullptr);
   javaCmDevInfoClass = g_javaCmDevInfoClass;
   javaCmDevInfoObject = g_javaCmDevInfoObject;
   return 0;
 
 }
 
 int32_t VideoCaptureAndroid::ReleaseAndroidDeviceInfoObjects(
     bool attached) {