diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index 4597d35..19f7145 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -521,7 +521,9 @@
             mIsPrepared = false;
         }
 
-        mView.onPlaybackError();
+        if (mView != null) {
+            mView.onPlaybackError();
+        }
 
         mPosition = 0;
         mIsPlaying = false;
@@ -536,7 +538,9 @@
 
         // Reset the seekbar position to the beginning.
         mPosition = 0;
-        mView.setClipPosition(0, mDuration.get());
+        if (mView != null) {
+            mView.setClipPosition(0, mDuration.get());
+        }
     }
 
     @Override
@@ -610,7 +614,9 @@
         mPosition = mMediaPlayer.getCurrentPosition();
         Log.d(TAG, "Paused playback at " + mPosition + ".");
 
-        mView.onPlaybackStopped();
+        if (mView != null) {
+            mView.onPlaybackStopped();
+        }
         mAudioManager.abandonAudioFocus(this);
 
         mActivity.getWindow().clearFlags(LayoutParams.FLAG_KEEP_SCREEN_ON);
