diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..04cef25
Binary files /dev/null and b/.DS_Store differ
diff --git a/Jukebox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Jukebox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Jukebox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Source/Jukebox.swift b/Source/Jukebox.swift
index b7d0200..cec4f0e 100644
--- a/Source/Jukebox.swift
+++ b/Source/Jukebox.swift
@@ -356,8 +356,9 @@ open class Jukebox: NSObject, JukeboxItemDelegate {
             if let player = player {
                 player.play()
             } else {
-                currentItem!.refreshPlayerItem(withAsset: currentItem!.playerItem!.asset)
-                startNewPlayer(forItem: currentItem!.playerItem!)
+                guard let currentItem = currentItem else { return }
+                currentItem.refreshPlayerItem(withAsset: currentItem.playerItem!.asset)
+                startNewPlayer(forItem: currentItem.playerItem!)
             }
             state = .playing
         }
@@ -377,6 +378,11 @@ open class Jukebox: NSObject, JukeboxItemDelegate {
         invalidatePlayback(shouldResetIndex: false)
         player = AVPlayer(playerItem: item)
         player?.allowsExternalPlayback = false
+        
+        if #available(iOS 10.0, *) {
+            player?.automaticallyWaitsToMinimizeStalling = false
+        }
+        
         startProgressTimer()
         seek(toSecond: 0, shouldPlay: true)
         updateInfoCenter()