diff --git a/runtime/vm/cpuinfo_linux.cc b/runtime/vm/cpuinfo_linux.cc
index 27cc16ebd81..22e86cb5242 100644
--- a/runtime/vm/cpuinfo_linux.cc
+++ b/runtime/vm/cpuinfo_linux.cc
@@ -67,6 +67,7 @@ void CpuInfo::Cleanup() {
 bool CpuInfo::FieldContains(CpuInfoIndices idx, const char* search_string) {
   if (method_ == kCpuInfoCpuId) {
     const char* field = CpuId::field(idx);
+    if (field == NULL) return false;
     bool contains = (strstr(field, search_string) != NULL);
     free(const_cast<char*>(field));
     return contains;
diff --git a/runtime/vm/image_snapshot.cc b/runtime/vm/image_snapshot.cc
index c11a5faf6fe..912eb131fac 100644
--- a/runtime/vm/image_snapshot.cc
+++ b/runtime/vm/image_snapshot.cc
@@ -640,6 +640,7 @@ const char* ImageWriter::SectionSymbol(ProgramSection section, bool vm) {
     case ProgramSection::BuildId:
       return kSnapshotBuildIdAsmSymbol;
   }
+  UNREACHABLE();
   return nullptr;
 }