diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 9afd671..a4fce5d 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -967,7 +967,8 @@
                     if (isFmOn() && getResources()
                             .getBoolean(R.bool.def_headset_next_enabled)) {
                         try {
-                            mCallbacks.onSeekNextStation();
+                            if ((mServiceInUse) && (mCallbacks != null))
+                                mCallbacks.onSeekNextStation();
                         }catch (RemoteException e) {
                         }
                     }
@@ -1066,7 +1067,8 @@
        mPlaybackInProgress = true;
        configureAudioDataPath(true);
        try {
-           mCallbacks.onFmAudioPathStarted();
+           if ((mServiceInUse) && (mCallbacks != null))
+               mCallbacks.onFmAudioPathStarted();
        } catch(RemoteException e) {
            e.printStackTrace();
        }
@@ -1077,7 +1079,8 @@
        configureAudioDataPath(false);
        mPlaybackInProgress = false;
        try {
-           mCallbacks.onFmAudioPathStopped();
+           if ((mServiceInUse) && (mCallbacks != null))
+               mCallbacks.onFmAudioPathStopped();
        } catch(RemoteException e) {
            e.printStackTrace();
        }
