diff --git a/internal/http/dj_handlers.go b/internal/http/dj_handlers.go
index e191fd1..34cecae 100644
--- a/internal/http/dj_handlers.go
+++ b/internal/http/dj_handlers.go
@@ -88,6 +88,12 @@ func (dj *DJHandlers) PlaylistNext(w http.ResponseWriter, _ *http.Request) {
 		return
 	}
 
+	defer func() {
+		if err := recover(); err != nil {
+			log.Printf("Panic occured with %s: %s", nxt, err)
+		}
+	}()
+
 	newSong := radio.Song{
 		Artist:   oggf.GetTag("artist"),
 		Title:    oggf.GetTag("title"),
diff --git a/pkg/oggtag/oggtag.go b/pkg/oggtag/oggtag.go
index dc43de0..cbbc712 100644
--- a/pkg/oggtag/oggtag.go
+++ b/pkg/oggtag/oggtag.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	bufferLength = 6144
+	bufferLength = 6200
 	OggS         = "OggS"
 	OggSLen      = len(OggS)
 	Vorbis       = "vorbis"