diff --git a/src/com/peculiargames/andmodplug/PlayerThread.java b/src/com/peculiargames/andmodplug/PlayerThread.java
index 5942880..a4f96ae 100644
--- a/src/com/peculiargames/andmodplug/PlayerThread.java
+++ b/src/com/peculiargames/andmodplug/PlayerThread.java
@@ -763,10 +763,13 @@ public void StopThread() {
      * track, but seem to get an uninitialized audio track here
      * occasionally, generating an IllegalStateException.
      */
-    try {
+    if (mMytrack != null) try {
       if (mMytrack.getState() == AudioTrack.STATE_INITIALIZED)
         mMytrack.stop();
-    } catch (IllegalStateException ise) {
+    } catch (NullPointerException npe) {
+      npe.printStackTrace();
+    }
+      catch (IllegalStateException ise) {
       ise.printStackTrace();
     }
 
diff --git a/src/org/jfedor/frozenbubble/FrozenBubble.java b/src/org/jfedor/frozenbubble/FrozenBubble.java
index 6b24432..b297531 100644
--- a/src/org/jfedor/frozenbubble/FrozenBubble.java
+++ b/src/org/jfedor/frozenbubble/FrozenBubble.java
@@ -846,7 +846,6 @@ private void restoreGamePrefs() {
     targetMode = mConfig.getInt    ("targetMode", POINT_TO_SHOOT       );
 
     BubbleSprite.setCollisionThreshold(collision);
-    setTargetMode(targetMode);
     setTargetModeOrientation();
   }