diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index baaa13c..6dab5c6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -439,7 +439,12 @@
                     }
                     mEngine = null;
                 }
-                unbindService(this);
+                try {
+                    unbindService(this);
+                } catch (IllegalArgumentException e) {
+                    Log.w(LOG_TAG, "Can't unbind wallpaper service. "
+                            + "It might have crashed, just ignoring.", e);
+                }
                 mService = null;
             }
         }
@@ -485,7 +490,7 @@
                 }
             }
         }
-        
+
         public ParcelFileDescriptor setWallpaper(String name) {
             return null;
         }