diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index ced47e5..0feb9b2 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.TwentyCodes.android.LocationRinger"
     android:installLocation="internalOnly"
-    android:versionCode="137"
-    android:versionName="fc8952e" >
+    android:versionCode="143"
+    android:versionName="5ad5cb4" >
 
     <uses-sdk android:minSdkVersion="7"/>
 
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java
index d25f754..0a884c3 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/RingerProcessingService.java
@@ -230,11 +230,17 @@ public class RingerProcessingService extends Service {
 			e.printStackTrace();
 		}
 
+		if(intent == null)
+			stopSelf(startId);
+		
 		if (intent.getParcelableExtra(LocationLibraryConstants.INTENT_EXTRA_LOCATION_CHANGED) != null) {
 			mLocation = intent.getParcelableExtra(LocationLibraryConstants.INTENT_EXTRA_LOCATION_CHANGED);
 			processRingers();
-		} else if (Debug.DEBUG)
-			Log.d(TAG, "Location was null");
+		} else {
+			if (Debug.DEBUG)
+				Log.d(TAG, "Location was null");
+			stopSelf(startId);
+		}
 		return super.onStartCommand(intent, flags, startId);
 	}