diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 951234d9e..b3faeea73 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -62,7 +62,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
-import android.os.RemoteException;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -228,7 +227,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     }
     try {
       return trackRecordingService.isRecording();
-    } catch (RemoteException e) {
+    } catch (Exception e) {  // TODO: Emergency fix.
       Log.e(MyTracksConstants.TAG, "MyTracks: Remote exception.", e);
 
       // Fall back to alternative check method.
@@ -908,7 +907,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker?");
           return -4;
         }
-      } catch (RemoteException e) {
+      } catch (Exception e) {  // TODO: Emergency fix.
         Toast.makeText(this, R.string.error_unable_to_insert_marker,
             Toast.LENGTH_LONG).show();
         Log.e(MyTracksConstants.TAG, "Cannot insert waypoint marker.", e);
@@ -948,7 +947,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?");
           return -4;
         }
-      } catch (RemoteException e) {
+      } catch (Exception e) {  // TODO: Emergency fix.
         Toast.makeText(this, R.string.error_unable_to_insert_marker,
             Toast.LENGTH_LONG).show();
         Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker?", e);
@@ -1016,7 +1015,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       setSelectedTrackId(recordingTrackId);
       Toast.makeText(this, getString(R.string.status_now_recording),
           Toast.LENGTH_SHORT).show();
-    } catch (RemoteException e) {
+    } catch (Exception e) {  // TODO: Emergency fix.
       Toast.makeText(this,
           getString(R.string.error_unable_to_start_recording),
           Toast.LENGTH_SHORT).show();
@@ -1049,7 +1048,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       long currentTrackId = recordingTrackId;
       try {
         trackRecordingService.endCurrentTrack();
-      } catch (RemoteException e) {
+      } catch (Exception e) {  // TODO: Emergency fix.
         Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e);
       }
       Intent intent = new Intent(MyTracks.this, MyTracksDetails.class);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 0302c8ec9..3bffbfe1c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -725,7 +725,8 @@ public class TrackRecordingService extends Service implements LocationListener {
     locationManager = null;
     notificationManager = null;
     providerUtils = null;
-    binder.detachFromService();
+    // TODO: Emergency fix to avoid NPE for buggy activities.
+    //binder.detachFromService();
     binder = null;
 
     // This should be the last operation.