diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index 47bd3eb4..cbf6d1fe 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -644,9 +644,9 @@ namespace Exiv2 {
                               << " entries considered invalid; not read.\n";
 #endif
                     io_->seek(io_->tell() + nameLength, BasicIo::beg);
+                } else {
+                    io_->read(buf.pData_, nameLength);
                 }
-            else
-                io_->read(buf.pData_, nameLength);
 
                 v->read(toString16(buf));
                 if(dataType == 6) {
@@ -676,9 +676,9 @@ namespace Exiv2 {
                               << " entries considered invalid; not read.\n";
 #endif
                     io_->seek(io_->tell() + nameLength, BasicIo::beg);
+                } else {
+                    io_->read(buf.pData_, nameLength);
                 }
-            else
-                io_->read(buf.pData_, nameLength);
 
                 v->read(toString16(buf));
 
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index f9a8b7dd..8fad3beb 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -1065,12 +1065,13 @@ namespace Exiv2 {
                               << " Entries considered invalid. Not Processed.\n";
 #endif
                     io_->seek(io_->tell() + dataLength, BasicIo::beg);
+                } else {
+                    io_->read(buf.pData_, dataLength);
                 }
-            else
-                io_->read(buf.pData_, dataLength);
 
-                if(td)
+                if(td) {
                     xmpData_[exvGettext(td->label_)] = Exiv2::toString(buf.pData_);
+                }
             }
             else if(dataType == 4)  {
                 dataLength = Exiv2::getUShort(buf.pData_, bigEndian) * 4;
@@ -1577,8 +1578,10 @@ namespace Exiv2 {
                 if (timeScale_ <= 0) timeScale_ = 1;
                 break;
             case Duration:
-                if(timeScale_ != 0) // To prevent division by zero
-                xmpData_["Xmp.video.Duration"] = returnBufValue(buf) * 1000 / timeScale_; break;
+                if(timeScale_ != 0) { // To prevent division by zero
+                    xmpData_["Xmp.video.Duration"] = returnBufValue(buf) * 1000 / timeScale_;
+                }
+                break;
             case PreferredRate:
                 xmpData_["Xmp.video.PreferredRate"] = returnBufValue(buf, 2) + ((buf.pData_[2] * 256 + buf.pData_[3]) * 0.01); break;
             case PreferredVolume: