diff --git a/src/elf.cc b/src/elf.cc
index 59f10e1..e02173a 100644
--- a/src/elf.cc
+++ b/src/elf.cc
@@ -417,7 +417,7 @@ void ElfFile::Section::ReadRelocationWithAddend(Elf64_Word index,
 }
 
 void ElfFile::NoteIter::Next() {
-  if (remaining_.empty()) {
+  if (remaining_.empty() || remaining_.compare("\0")) {
     done_ = true;
     return;
   }