diff --git a/libretroshare/src/gxs/rsdataservice.cc b/libretroshare/src/gxs/rsdataservice.cc
index ed05094cc..5cd9de589 100644
--- a/libretroshare/src/gxs/rsdataservice.cc
+++ b/libretroshare/src/gxs/rsdataservice.cc
@@ -708,10 +708,8 @@ std::shared_ptr<RsGxsMsgMetaData> RsDataService::locked_getMsgMeta(RetroCursor &
 
     if(ok)
         return msgMeta;
-    else
-        return nullptr;
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -750,10 +748,9 @@ RsNxsMsg* RsDataService::locked_getMessage(RetroCursor &c)
 
     if(ok)
         return msg;
-    else
-        delete msg;
 
-    return NULL;
+    delete msg;
+    return nullptr;
 }
 
 int RsDataService::storeMessage(const std::list<RsNxsMsg*>& msg)