diff --git a/lib/src/main/java/xyz/gianlu/librespot/audio/cdn/CdnManager.java b/lib/src/main/java/xyz/gianlu/librespot/audio/cdn/CdnManager.java
index fc2ea48f..4b3ce875 100644
--- a/lib/src/main/java/xyz/gianlu/librespot/audio/cdn/CdnManager.java
+++ b/lib/src/main/java/xyz/gianlu/librespot/audio/cdn/CdnManager.java
@@ -345,9 +345,11 @@ public void close() {
                 super.close();
                 executorService.shutdown();
 
-                try {
-                    cacheHandler.close();
-                } catch (IOException ignored) {
+                if (cacheHandler != null) {
+                    try {
+                        cacheHandler.close();
+                    } catch (IOException ignored) {
+                    }
                 }
             }
 
diff --git a/lib/src/main/java/xyz/gianlu/librespot/audio/storage/AudioFileStreaming.java b/lib/src/main/java/xyz/gianlu/librespot/audio/storage/AudioFileStreaming.java
index 859091ac..81205ac9 100644
--- a/lib/src/main/java/xyz/gianlu/librespot/audio/storage/AudioFileStreaming.java
+++ b/lib/src/main/java/xyz/gianlu/librespot/audio/storage/AudioFileStreaming.java
@@ -157,9 +157,11 @@ public void close() {
         if (chunksBuffer != null)
             chunksBuffer.close();
 
-        try {
-            cacheHandler.close();
-        } catch (IOException ignored) {
+        if (cacheHandler != null) {
+            try {
+                cacheHandler.close();
+            } catch (IOException ignored) {
+            }
         }
     }