diff --git a/MusicPlayer/MusicPlayer/AudioHandler.cs b/MusicPlayer/MusicPlayer/AudioHandler.cs
index 0f8e05d..1e3594c 100755
--- a/MusicPlayer/MusicPlayer/AudioHandler.cs
+++ b/MusicPlayer/MusicPlayer/AudioHandler.cs
@@ -122,6 +122,7 @@ namespace MusicPlayer
             catch(Exception e)
             {
                 AState = AudioState.STOPPED;
+                main.form.SongFinished();
                 return;
             }
             
@@ -207,6 +208,7 @@ namespace MusicPlayer
             {
                 BState = BufferState.EMPTY;
                 AState = AudioState.STOPPED;
+                main.form.SongFinished();
                 return;
             }