diff --git a/src/org/jfedor/frozenbubble/FrozenBubble.java b/src/org/jfedor/frozenbubble/FrozenBubble.java
index 2e7b102..6eec20f 100644
--- a/src/org/jfedor/frozenbubble/FrozenBubble.java
+++ b/src/org/jfedor/frozenbubble/FrozenBubble.java
@@ -822,8 +822,8 @@ private void playMusic(boolean startPlaying)
     /*
      * Ascertain which song to play.
      */
-    if (mGameView != null)
-      modNow = mGameView.getThread().getCurrentLevelIndex() % MODlist.length;
+    if (mGameThread != null)
+      modNow = mGameThread.getCurrentLevelIndex() % MODlist.length;
     else
     {
       Random rand = new Random();
@@ -869,7 +869,7 @@ private void restoreGamePrefs() {
    * Save critically important game information.
    */
   public void saveState() {
-    if ((mGameView != null) && (numPlayers == 1)) {
+    if ((mGameThread != null) && (numPlayers == 1)) {
       /*
        * Allow level editor functionalities.
        */