diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java
index 7a9187f4..e41dceb6 100644
--- a/src/services/EntertainmentService.java
+++ b/src/services/EntertainmentService.java
@@ -702,7 +702,10 @@ public class EntertainmentService implements INetworkDispatch {
 					//spectator.setMoodAnimation("neutral");
 					performer.removeSpectator(spectator);
 	
-					if (spectator.getInspirationTick().cancel(true))
+					if (spectator.getInspirationTick() != null) 
+						spectator.getInspirationTick().cancel(true);
+					
+					if (spectator.getSpectatorTask() != null)
 						spectator.getSpectatorTask().cancel(true);
 					
 				}