diff --git a/app/converter/converter.go b/app/converter/converter.go
index b1bd466a..6ccb8b67 100644
--- a/app/converter/converter.go
+++ b/app/converter/converter.go
@@ -31,7 +31,7 @@ func NewConverter(r *http.Request) (*Converter, error) {
 
 	reader, err := r.MultipartReader()
 	if err != nil {
-		return nil, err
+		return c, err
 	}
 
 	for {
@@ -47,7 +47,7 @@ func NewConverter(r *http.Request) (*Converter, error) {
 
 		f, err := gfile.NewFile(c.workingDir, part, fileName)
 		if err != nil {
-			return nil, err
+			return c, err
 		}
 
 		c.files = append(c.files, f)
diff --git a/app/handlers.go b/app/handlers.go
index c63db562..29245cef 100644
--- a/app/handlers.go
+++ b/app/handlers.go
@@ -62,6 +62,12 @@ func convertHandler(next http.Handler) http.Handler {
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			logger.Error(err)
+
+			if c != nil {
+				r = context.WithConverter(r, c)
+				cleanup(r)
+			}
+
 			return
 		}