diff --git a/src/apps/mediaplayer/Controller.cpp b/src/apps/mediaplayer/Controller.cpp
index 0eb302b2f5..2a67715e11 100644
--- a/src/apps/mediaplayer/Controller.cpp
+++ b/src/apps/mediaplayer/Controller.cpp
@@ -480,7 +480,8 @@ Controller::TogglePlaying()
 
 	BAutolock _(this);
 
-	NodeManager::TogglePlaying();
+	if (InitCheck() == B_OK)
+		NodeManager::TogglePlaying();
 }
 
 
diff --git a/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp b/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp
index 5ac2bc5f61..e085453302 100644
--- a/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp
+++ b/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp
@@ -371,11 +371,8 @@ PlaybackManager::SetCurrentFrame(int64 frame)
 void
 PlaybackManager::SetPlayMode(int32 mode, bool continuePlaying)
 {
-	PlayingState* lastState = _LastState();
-	if (lastState == NULL)
-		return;
 //printf("PlaybackManager::SetPlayMode(%ld, %d)\n", mode, continuePlaying);
-	PlayingState* newState = new PlayingState(*lastState);
+	PlayingState* newState = new PlayingState(*_LastState());
 	newState->play_mode = mode;
 	// Jump to the playing start frame if we should not continue, where we
 	// stop.