diff --git a/src/org/traccar/client/TraccarService.java b/src/org/traccar/client/TraccarService.java
index deb2b8a..368a785 100644
--- a/src/org/traccar/client/TraccarService.java
+++ b/src/org/traccar/client/TraccarService.java
@@ -82,11 +82,17 @@ public class TraccarService extends Service {
     public void onDestroy() {
         StatusActivity.addMessage(getString(R.string.status_service_destroy));
 
-        sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+        if (sharedPreferences != null) {
+        	sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+        }
 
-        positionProvider.stopUpdates();
+        if (positionProvider != null) {
+        	positionProvider.stopUpdates();
+        }
 
-        clientController.stop();
+        if (clientController != null) {
+        	clientController.stop();
+        }
     }
 
     private PositionProvider.PositionListener positionListener = new PositionProvider.PositionListener() {