diff --git a/src/Config.h b/src/Config.h
index d8d51970..0aa377d5 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					4
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					1
-#define VER_LAMEXP_BUILD					780
+#define VER_LAMEXP_BUILD					781
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions
diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp
index f8003897..9bf1d3e1 100644
--- a/src/Thread_FileAnalyzer.cpp
+++ b/src/Thread_FileAnalyzer.cpp
@@ -32,6 +32,7 @@
 #include <QDate>
 #include <QTime>
 #include <QDebug>
+#include <QImage>
 
 #include <math.h>
 
@@ -582,12 +583,19 @@ void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, const QString &fileP
 								val = val.split(" ", QString::SkipEmptyParts, Qt::CaseInsensitive).first();
 							}
 							QByteArray coverData = QByteArray::fromBase64(val.toLatin1());
-							QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension));
-							if(coverFile.open(QIODevice::WriteOnly))
+							if(!(QImage::fromData(coverData, extension.toUpper().toLatin1().constData()).isNull()))
 							{
-								coverFile.write(coverData);
-								coverFile.close();
-								audioFile.setFileCover(coverFile.fileName(), true);
+								QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension));
+								if(coverFile.open(QIODevice::WriteOnly))
+								{
+									coverFile.write(coverData);
+									coverFile.close();
+									audioFile.setFileCover(coverFile.fileName(), true);
+								}
+							}
+							else
+							{
+								qWarning("Image data seems to be invalid :-(");
 							}
 							break;
 						}