diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
index 70cbe43dd8..dcccd884ec 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
@@ -65,7 +65,7 @@ public class DemoDownloadService extends DownloadService {
 
   @Override
   protected void onDownloadStateChanged(DownloadState downloadState) {
-    Notification notification = null;
+    Notification notification;
     if (downloadState.state == DownloadState.STATE_COMPLETED) {
       notification =
           DownloadNotificationUtil.buildDownloadCompletedNotification(
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index d424ed5ef0..305620d5f3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -462,7 +462,7 @@ public abstract class DownloadService extends Service {
     public void detachService(DownloadService downloadService, boolean unschedule) {
       Assertions.checkState(this.downloadService == downloadService);
       this.downloadService = null;
-      if (unschedule) {
+      if (scheduler != null && unschedule) {
         scheduler.cancel();
       }
     }