Automated import from //branches/cupcake/...@142021,142021
diff --git a/src/com/android/music/MusicBrowserActivity.java b/src/com/android/music/MusicBrowserActivity.java
index 632db1e..8208771 100644
--- a/src/com/android/music/MusicBrowserActivity.java
+++ b/src/com/android/music/MusicBrowserActivity.java
@@ -218,7 +218,10 @@
     private ServiceConnection autoshuffle = new ServiceConnection() {
         public void onServiceConnected(ComponentName classname, IBinder obj) {
             // we need to be able to bind again, so unbind
-            unbindService(this);
+            try {
+                unbindService(this);
+            } catch (IllegalArgumentException e) {
+            }
             IMediaPlaybackService serv = IMediaPlaybackService.Stub.asInterface(obj);
             if (serv != null) {
                 try {