diff --git a/Classes/TSMessage.m b/Classes/TSMessage.m
index 3fe360af..ea63d62e 100755
--- a/Classes/TSMessage.m
+++ b/Classes/TSMessage.m
@@ -185,6 +185,8 @@ - (id)init
 
 - (void)fadeInCurrentNotification
 {
+    if ([self.messages count] == 0) return;
+    
     notificationActive = YES;
     
     TSMessageView *currentView = [self.messages objectAtIndex:0];
@@ -276,7 +278,11 @@ - (void)fadeOutNotification:(TSMessageView *)currentView
      {
          [currentView removeFromSuperview];
          
-         [self.messages removeObjectAtIndex:0];
+         if ([self.messages count] > 0)
+         {
+             [self.messages removeObjectAtIndex:0];
+         }
+         
          notificationActive = NO;
          
          if ([self.messages count] > 0)