diff --git a/pkg/webdav/file.go b/pkg/webdav/file.go
index 7444855..5ef6aca 100644
--- a/pkg/webdav/file.go
+++ b/pkg/webdav/file.go
@@ -195,9 +195,11 @@ func (f *File) streamWithRetry(w http.ResponseWriter, r *http.Request, retryCoun
 		return retryErr
 	}
 
+	if err := f.streamBuffer(w, resp.Body); err != nil {
+		return err
+	}
 	setVideoResponseHeaders(w, resp, isRangeRequest == 1)
-
-	return f.streamBuffer(w, resp.Body)
+	return nil
 }
 
 func (f *File) streamBuffer(w http.ResponseWriter, src io.Reader) error {
diff --git a/pkg/webdav/handler.go b/pkg/webdav/handler.go
index 66de07b..b1e1226 100644
--- a/pkg/webdav/handler.go
+++ b/pkg/webdav/handler.go
@@ -484,7 +484,7 @@ func (h *Handler) handleGet(w http.ResponseWriter, r *http.Request) {
 			} else {
 				// Generic error
 				if !hasHeadersWritten(w) {
-					http.Error(w, "Stream error", http.StatusInternalServerError)
+					http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 					return
 				} else {
 					h.logger.Error().