diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java b/library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java
index 1ebba25f4e..48ce051c99 100644
--- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java
+++ b/library/src/main/java/com/google/android/exoplayer/dash/mpd/ContentProtection.java
@@ -70,8 +70,8 @@ public class ContentProtection {
   @Override
   public int hashCode() {
     int hashCode = schemeUriId.hashCode();
-    hashCode = (37 * hashCode) + (uuid != null ? uuid.hashCode() : 0);
-    hashCode = (37 * hashCode) + (data != null ? data.hashCode() : 0);
+    hashCode = (31 * hashCode) + (uuid != null ? uuid.hashCode() : 0);
+    hashCode = (31 * hashCode) + (data != null ? data.hashCode() : 0);
     return hashCode;
   }
 
diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
index 24d8b78c62..79a5250cd9 100644
--- a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
+++ b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
@@ -206,8 +206,11 @@ public final class Loader {
         executorThread = Thread.currentThread();
         if (!loadable.isLoadCanceled()) {
           TraceUtil.beginSection(loadable.getClass().getSimpleName() + ".load()");
-          loadable.load();
-          TraceUtil.endSection();
+          try {
+            loadable.load();
+          } finally {
+            TraceUtil.endSection();
+          }
         }
         sendEmptyMessage(MSG_END_OF_SOURCE);
       } catch (IOException e) {