diff --git a/application/src/org/yaaic/irc/IRCService.java b/application/src/org/yaaic/irc/IRCService.java
index ff625eb..c7790c3 100644
--- a/application/src/org/yaaic/irc/IRCService.java
+++ b/application/src/org/yaaic/irc/IRCService.java
@@ -141,7 +141,9 @@ public class IRCService extends Service
 	 */
     public int onStartCommand(Intent intent, int flags, int startId)
     {
-        handleCommand(intent);
+    	if (intent != null) {
+    		handleCommand(intent);
+    	}
 
         // We want this service to continue running until it is explicitly
         // stopped, so return sticky.