diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
index 9aee7305be..7ae3d838dd 100644
--- a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
+++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
@@ -87,7 +87,7 @@ public class AppRTCAudioManager {
   private AudioDevice userSelectedAudioDevice;
 
   // Contains speakerphone setting: auto, true or false
-  private final String useSpeakerphone;
+  @Nullable private final String useSpeakerphone;
 
   // Proximity sensor object. It measures the proximity of an object in cm
   // relative to the view screen of a device and can therefore be used to
diff --git a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index 2bd52cb0c0..97da9d980f 100644
--- a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -23,6 +23,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
@@ -300,6 +301,7 @@ public class ConnectActivity extends Activity {
    * Get a value from the shared preference or from the intent, if it does not
    * exist the default is used.
    */
+  @Nullable
   private String sharedPrefGetString(
       int attributeId, String intentName, int defaultId, boolean useFromIntent) {
     String defaultValue = getString(defaultId);
diff --git a/sdk/android/api/org/webrtc/Camera2Enumerator.java b/sdk/android/api/org/webrtc/Camera2Enumerator.java
index 69c030d5e7..b32b3ad302 100644
--- a/sdk/android/api/org/webrtc/Camera2Enumerator.java
+++ b/sdk/android/api/org/webrtc/Camera2Enumerator.java
@@ -78,6 +78,7 @@ public class Camera2Enumerator implements CameraEnumerator {
         == CameraMetadata.LENS_FACING_BACK;
   }
 
+  @Nullable
   @Override
   public List<CaptureFormat> getSupportedFormats(String deviceName) {
     return getSupportedFormats(context, deviceName);
@@ -165,11 +166,13 @@ public class Camera2Enumerator implements CameraEnumerator {
     }
   }
 
+  @Nullable
   static List<CaptureFormat> getSupportedFormats(Context context, String cameraId) {
     return getSupportedFormats(
         (CameraManager) context.getSystemService(Context.CAMERA_SERVICE), cameraId);
   }
 
+  @Nullable
   static List<CaptureFormat> getSupportedFormats(CameraManager cameraManager, String cameraId) {
     synchronized (cachedSupportedFormats) {
       if (cachedSupportedFormats.containsKey(cameraId)) {
diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
index e675d13c75..bf5a73482b 100644
--- a/sdk/android/api/org/webrtc/PeerConnection.java
+++ b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -395,6 +395,7 @@ public class PeerConnection {
       }
     }
 
+    @Nullable
     @CalledByNative("AdapterType")
     static AdapterType fromNativeIndex(int nativeIndex) {
       return BY_BITMASK.get(nativeIndex);
diff --git a/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
index c40aca0d6b..023e92cfb1 100644
--- a/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
+++ b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
@@ -18,6 +18,10 @@ package org.webrtc;
 class WebRtcClassLoader {
   @CalledByNative
   static Object getClassLoader() {
-    return WebRtcClassLoader.class.getClassLoader();
+    Object loader = WebRtcClassLoader.class.getClassLoader();
+    if (loader == null) {
+      throw new RuntimeException("Failed to get WebRTC class loader.");
+    }
+    return loader;
   }
 }