diff --git a/arangod/RestServer/ArangoServer.cpp b/arangod/RestServer/ArangoServer.cpp
index 66173bc78c..70f7435d58 100644
--- a/arangod/RestServer/ArangoServer.cpp
+++ b/arangod/RestServer/ArangoServer.cpp
@@ -1116,7 +1116,7 @@ void ArangoServer::openDatabases (bool checkVersion,
 
   if (res != TRI_ERROR_NO_ERROR) {
     if (checkVersion && res == TRI_ERROR_ARANGO_EMPTY_DATADIR) {
-      TRI_EXIT_FUNCTION(EXIT_SUCCESS, NULL);
+      TRI_EXIT_FUNCTION(EXIT_SUCCESS, nullptr);
     }
 
     LOG_FATAL_AND_EXIT("cannot start server: %s", TRI_errno_string(res));
diff --git a/arangod/Wal/SynchroniserThread.cpp b/arangod/Wal/SynchroniserThread.cpp
index b59c92bb1a..b4976f4249 100644
--- a/arangod/Wal/SynchroniserThread.cpp
+++ b/arangod/Wal/SynchroniserThread.cpp
@@ -183,7 +183,7 @@ int SynchroniserThread::doSync () {
   // get the logfile's file descriptor
   int fd = getLogfileDescriptor(region.logfileId);
   TRI_ASSERT(fd >= 0);
-  void** mmHandle = NULL;
+  void** mmHandle = nullptr;
   bool result = TRI_MSync(fd, mmHandle, region.mem, region.mem + region.size);
 
   LOG_TRACE("syncing logfile %llu, region %p - %p, length: %lu, wfs: %s",