diff --git a/Mage.Client/src/main/java/mage/client/util/MusicPlayer.java b/Mage.Client/src/main/java/mage/client/util/MusicPlayer.java
index 9c93f1a3d2..b1ccf6cfae 100644
--- a/Mage.Client/src/main/java/mage/client/util/MusicPlayer.java
+++ b/Mage.Client/src/main/java/mage/client/util/MusicPlayer.java
@@ -25,6 +25,7 @@ public class MusicPlayer {
     	filelist.removeAll();
     	File filedir = new File(filepath);
     	File[] fileread = filedir.listFiles();
+        if(fileread == null) return false;
     	if(fileread.length == 0)return false;
     	String filename;
     	for(File f:fileread){