diff --git a/proprietary/wvm/WVMFileSource.cpp b/proprietary/wvm/WVMFileSource.cpp
index 3da21ff5..22c93196 100644
--- a/proprietary/wvm/WVMFileSource.cpp
+++ b/proprietary/wvm/WVMFileSource.cpp
@@ -50,24 +50,15 @@ void WVMFileSource::Seek(unsigned long long offset)
 
 size_t WVMFileSource::Read(size_t amount, unsigned char *buffer)
 {
-    size_t result = mDataSource->readAt(mOffset, buffer, amount);
+    ssize_t result = mDataSource->readAt(mOffset, buffer, amount);
 
-#if 0
-    // debug code - log packets to files
-    char filename[32];
-    static int counter = 0;
-    sprintf(filename, "/data/wv/buf%d", counter++);
-    FILE *f = fopen(filename, "w");
-    if (!f)
-        LOGE("WVMFileSource: can't open %s", filename);
-    else {
-        fwrite(buffer, amount, 1, f);
-        fclose(f);
+    if (result < 0) {
+        LOGE("mDataSource-readAt returned error %d\n", (int)result );
+        result = 0;
+    } else  {
+        mOffset += result;
     }
-    LOGD("WVMFileSource::Read(%d bytes to buf=%p)", amount, buffer);
-#endif
 
-    mOffset += result;
     return result;
 }