diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m
index 40498c5..b445dbd 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.m
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.m
@@ -949,27 +949,29 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
     
 	if (audioQueue == nil)
     {
-        if (currentlyReadingEntry == currentlyPlayingEntry && currentlyReadingEntry != nil)
+        if (currentlyPlayingEntry == nil)
         {
-            [self createAudioQueue];
+            return;
+        }
         
-            if (audioQueue == nil)
+        [self createAudioQueue];
+    
+        if (audioQueue == nil)
+        {
+            return;
+        }
+        
+        if (self.internalState == AudioPlayerInternalStateStopped)
+        {
+            if (stopReason == AudioPlayerStopReasonEof)
+            {
+                stopReason = AudioPlayerStopReasonNoStop;
+                self.internalState = AudioPlayerInternalStateWaitingForData;
+            }
+            else
             {
                 return;
             }
-            
-            if (self.internalState == AudioPlayerInternalStateStopped)
-            {
-                if (stopReason == AudioPlayerStopReasonEof)
-                {
-                    stopReason = AudioPlayerStopReasonNoStop;
-                    self.internalState = AudioPlayerInternalStateWaitingForData;
-                }
-                else
-                {
-                    return;
-                }
-            }
         }
     }
     else if (memcmp(&currentAudioStreamBasicDescription, &currentlyReadingEntry->audioStreamBasicDescription, sizeof(currentAudioStreamBasicDescription)) != 0)
@@ -1032,7 +1034,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
             {
                 [self enqueueBuffer];
                 
-                if (disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
+                if (audioQueue == nil || disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
                 {
                     return;
                 }
@@ -1060,7 +1062,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
             {
                 [self enqueueBuffer];
                 
-                if (disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
+                if (audioQueue == nil || disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
                 {
                     return;
                 }
@@ -1081,7 +1083,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
 			{
 				[self enqueueBuffer];
                 
-                if (disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
+                if (audioQueue == nil || disposeWasRequested || seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed)
                 {
                     return;
                 }
@@ -1276,10 +1278,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
                         && self.internalState != AudioPlayerInternalStateWaitingForData
                         && [self moreFramesAreDefinitelyAvailableToPlay])
                     {
-                        if ([self moreFramesAreDefinitelyAvailableToPlay])
-                        {
-                        }
-                        
                         AudioQueuePause(audioQueue);
                         
                         self->rebufferingStartFrames = [self currentTimeInFrames];