diff --git a/io/previewgenerator.cpp b/io/previewgenerator.cpp
index a2a6824d4..5b808e8aa 100644
--- a/io/previewgenerator.cpp
+++ b/io/previewgenerator.cpp
@@ -60,12 +60,13 @@ void PreviewGenerator::run() {
             int read_ret = av_read_frame(fmt_ctx, &packet);
             if (read_ret < 0) {
                 end_of_file = true;
-                if (read_ret != AVERROR_EOF) qDebug() << "[ERROR] Failed to read packet for preview generation";
+                if (read_ret != AVERROR_EOF) qDebug() << "[ERROR] Failed to read packet for preview generation" << read_ret;
                 break;
-            } else if (codec_ctx[packet.stream_index] != NULL) {
+            }
+            if (codec_ctx[packet.stream_index] != NULL) {
                 int send_ret = avcodec_send_packet(codec_ctx[packet.stream_index], &packet);
-                if (send_ret < 0) {
-                    qDebug() << "[ERROR] Failed to send packet for preview generation - aborting";
+                if (send_ret < 0 && send_ret != AVERROR(EAGAIN)) {
+                    qDebug() << "[ERROR] Failed to send packet for preview generation - aborting" << send_ret;
                     end_of_file = true;
                     break;
                 }
diff --git a/olive.pro.user b/olive.pro.user
index 93707150a..46889be05 100644
--- a/olive.pro.user
+++ b/olive.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.6.2, 2018-07-10T13:36:23. -->
+<!-- Written by QtCreator 4.6.2, 2018-07-11T02:03:42. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>