diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index 49aff657a..9d680da4d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -220,11 +220,18 @@ public final class PlayQueueActivity extends AppCompatActivity
             }
 
             @Override
-            public void onServiceConnected(final ComponentName name, final IBinder service) {
+            public void onServiceConnected(final ComponentName name, final IBinder binder) {
                 Log.d(TAG, "Player service is connected");
 
-                if (service instanceof PlayerService.LocalBinder) {
-                    player = ((PlayerService.LocalBinder) service).getService().getPlayer();
+                if (binder instanceof PlayerService.LocalBinder) {
+                    @Nullable final PlayerService s =
+                            ((PlayerService.LocalBinder) binder).getService();
+                    if (s == null) {
+                        throw new IllegalArgumentException(
+                                "PlayerService.LocalBinder.getService() must never be"
+                                        + "null after the service connects");
+                    }
+                    player = s.getPlayer();
                 }
 
                 if (player == null || player.getPlayQueue() == null || player.exoPlayerIsNull()) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
index 22540a138..5452068d9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
@@ -188,9 +188,15 @@ public final class PlayerHolder {
             }
             final PlayerService.LocalBinder localBinder = (PlayerService.LocalBinder) service;
 
-            playerService = localBinder.getService();
+            @Nullable final PlayerService s = localBinder.getService();
+            if (s == null) {
+                throw new IllegalArgumentException(
+                        "PlayerService.LocalBinder.getService() must never be"
+                                + "null after the service connects");
+            }
+            playerService = s;
             if (listener != null) {
-                listener.onServiceConnected(playerService);
+                listener.onServiceConnected(s);
                 getPlayer().ifPresent(p -> listener.onPlayerConnected(p, playAfterConnect));
             }
             startPlayerListener();
@@ -198,7 +204,7 @@ public final class PlayerHolder {
 
             // notify the main activity that binding the service has completed, so that it can
             // open the bottom mini-player
-            NavigationHelper.sendPlayerStartedEvent(localBinder.getService());
+            NavigationHelper.sendPlayerStartedEvent(s);
         }
     }