diff --git a/cpp/src/phonenumbers/default_logger.h b/cpp/src/phonenumbers/default_logger.h
index 706ebf682..1cde2a50b 100644
--- a/cpp/src/phonenumbers/default_logger.h
+++ b/cpp/src/phonenumbers/default_logger.h
@@ -22,6 +22,15 @@
 namespace i18n {
 namespace phonenumbers {
 
+// There is no Logger in the new base implementation - provide a NOP one.
+class Logger {
+ public:
+  Logger() {}
+  virtual ~Logger() {}
+
+  static void set_logger_impl(Logger*) {}
+};
+
 // If Google base/ is used, LOG() and VLOG() from base/logging.h are used
 // therefore the default logger implementation (StdoutLogger) instantiated in
 // phonenumberutil will actually never be used. Thus provide a dummy
diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
index 7f7a436fa..05847ec59 100644
--- a/cpp/test/phonenumbers/asyoutypeformatter_test.cc
+++ b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
@@ -34,7 +34,7 @@ class AsYouTypeFormatterTest : public testing::Test {
   }
 
   const PhoneMetadata* GetCurrentMetadata() const {
-    return CHECK_NOTNULL(formatter_.get())->current_metadata_;
+    return formatter_.get()->current_metadata_;
   }
 
   int ConvertUnicodeStringPosition(const UnicodeString& s, int pos) const {