diff --git a/arangod/VocBase/replication-logger.c b/arangod/VocBase/replication-logger.c
index a36bc7d092..4cab437379 100644
--- a/arangod/VocBase/replication-logger.c
+++ b/arangod/VocBase/replication-logger.c
@@ -1208,6 +1208,14 @@ TRI_replication_logger_t* TRI_CreateReplicationLogger (TRI_vocbase_t* vocbase) {
                                    IsEqualKeyClient,
                                    NULL);
 
+  if (res != TRI_ERROR_NO_ERROR) {
+    // out of memory
+    FreeBuffers(logger);
+    TRI_Free(TRI_CORE_MEM_ZONE, logger);
+
+    return NULL;
+  }
+
   TRI_InitReadWriteLock(&logger->_statusLock);
   TRI_InitReadWriteLock(&logger->_clientsLock);
   TRI_InitSpin(&logger->_idLock);