diff --git a/build/x86-msvs/obj_int_extract.bat b/build/x86-msvs/obj_int_extract.bat
index e2b93b1f6c438bd7fed5a168b25daf70b4434255..90bb18184880b85a3a96af99f2188a7dd9d7b222 100644
--- a/build/x86-msvs/obj_int_extract.bat
+++ b/build/x86-msvs/obj_int_extract.bat
@@ -10,6 +10,6 @@ echo on
 cl /I "./" /I "%1" /nologo /c "%1/vp9/common/asm_com_offsets.c"
 cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/asm_dec_offsets.c"
 cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c"
-obj_int_extract.exe rvds "asm_com_offsets.obj" > "asm_com_offsets.asm"
-obj_int_extract.exe rvds "asm_dec_offsets.obj" > "asm_dec_offsets.asm"
-obj_int_extract.exe rvds "asm_enc_offsets.obj" > "asm_enc_offsets.asm"
+obj_int_extract.exe rvds "asm_com_offsets.obj" > "vp9_asm_com_offsets.asm"
+obj_int_extract.exe rvds "asm_dec_offsets.obj" > "vp9_asm_dec_offsets.asm"
+obj_int_extract.exe rvds "asm_enc_offsets.obj" > "vp9_asm_enc_offsets.asm"
diff --git a/vpxenc.c b/vpxenc.c
index 6688231d779fb23dc5e1ba21dc6fdced831e2b2c..33dd805ad9319411f2628aab8fa673e94d4e813a 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -2418,7 +2418,7 @@ int main(int argc, const char **argv_) {
         got_data = 0;
         FOREACH_STREAM(get_cx_data(stream, &global, &got_data));
 
-        if (global.test_decode)
+        if (got_data && global.test_decode)
           FOREACH_STREAM(test_decode(stream, frames_in));
       }