diff --git a/src/bgp/bgp_server.cc b/src/bgp/bgp_server.cc
index b11d53e7cf7..90521171507 100644
--- a/src/bgp/bgp_server.cc
+++ b/src/bgp/bgp_server.cc
@@ -267,6 +267,7 @@ BgpServer::BgpServer(EventManager *evm)
       config_mgr_(BgpObjectFactory::Create<BgpConfigManager>(this)),
       updater_(new ConfigUpdater(this)) {
     num_up_peer_ = 0;
+    message_build_error_ = 0;
 }
 
 BgpServer::~BgpServer() {
diff --git a/src/bgp/bgp_server.h b/src/bgp/bgp_server.h
index 6e74d635e43..6139f23f51c 100644
--- a/src/bgp/bgp_server.h
+++ b/src/bgp/bgp_server.h
@@ -190,7 +190,7 @@ class BgpServer {
     boost::scoped_ptr<BgpConfigManager> config_mgr_;
     boost::scoped_ptr<ConfigUpdater> updater_;
 
-    mutable uint64_t message_build_error_;
+    mutable tbb::atomic<uint64_t> message_build_error_;
 
     DISALLOW_COPY_AND_ASSIGN(BgpServer);
 };