diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 099024f1..01324189 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -255,7 +255,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst
 		
 		
 
-		if (intent.getAction()!=null && intent.getAction().equals("onboot"))
+		if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot"))
 		{
 			
 			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);