diff --git a/fetcher/fetcher.go b/fetcher/fetcher.go
index d03cb2d7879b098a88558ac4291a614232f4e652..1422aa6d4cc7239837ed040b574c7ab468065f7a 100644
--- a/fetcher/fetcher.go
+++ b/fetcher/fetcher.go
@@ -185,9 +185,17 @@ func decodeAttachmentData(rawBytes []byte, encoding string) ([]byte, error) {
 	switch strings.ToLower(encoding) {
 	case "base64":
 		decoder := base64.NewDecoder(base64.StdEncoding, bytes.NewReader(rawBytes))
-		return ioutil.ReadAll(decoder)
+		data, err := ioutil.ReadAll(decoder)
+		if err != nil {
+			return nil, err
+		}
+		return data, nil
 	case "quoted-printable":
-		return ioutil.ReadAll(quotedprintable.NewReader(bytes.NewReader(rawBytes)))
+		data, err := ioutil.ReadAll(quotedprintable.NewReader(bytes.NewReader(rawBytes)))
+		if err != nil {
+			return nil, err
+		}
+		return data, nil
 	default:
 		return rawBytes, nil
 	}