diff --git a/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc
index 6ff6a46589..0d8be0027b 100644
--- a/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc
+++ b/src/modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.cc
@@ -37,7 +37,8 @@ NETEQTEST_NetEQClass::NETEQTEST_NetEQClass(enum WebRtcNetEQDecoder *usedCodec, i
     _bufferMem(NULL),
     _preparseRTP(false),
     _fsmult(1),
-    _isMaster(true)
+    _isMaster(true),
+    _noDecode(false)
 {
 #ifdef WINDOWS_TIMING
     _totTimeRecIn.QuadPart = 0;
diff --git a/src/modules/audio_coding/neteq/test/rtp_to_text.cc b/src/modules/audio_coding/neteq/test/rtp_to_text.cc
index 7e9f4f59cf..1112d79c87 100644
--- a/src/modules/audio_coding/neteq/test/rtp_to_text.cc
+++ b/src/modules/audio_coding/neteq/test/rtp_to_text.cc
@@ -89,9 +89,18 @@ int main(int argc, char* argv[])
 
     // read file header
     char firstline[FIRSTLINELEN];
-    fgets(firstline, FIRSTLINELEN, inFile);
+    if (fgets(firstline, FIRSTLINELEN, inFile) == NULL)
+    {
+        std::cout << "Error reading file " << input_filename << std::endl;
+        return -1;
+    }
+
     // start_sec + start_usec + source + port + padding
-    fread(firstline, 4+4+4+2+2, 1, inFile);
+    if (fread(firstline, 4+4+4+2+2, 1, inFile) != 1)
+    {
+        std::cout << "Error reading file " << input_filename << std::endl;
+        return -1;
+    }
 
     while (packet->readFromFile(inFile) >= 0)
     {