diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp
index bf9dbf451..15e7efed8 100644
--- a/slsDetectorSoftware/src/DetectorImpl.cpp
+++ b/slsDetectorSoftware/src/DetectorImpl.cpp
@@ -722,7 +722,7 @@ int DetectorImpl::InsertGapPixels(char *image, char *&gpImage, bool quadEnable,
                          "Sending dummy data without gap pixels.\n";
         double bytesPerPixel = (double)dr / 8.00;
         int imagesize = nPixelsy * nPixelsx * bytesPerPixel;
-        if (gpImage == NULL) {
+        if (gpImage == nullptr) {
             gpImage = new char[imagesize];
         }
         memset(gpImage, 0xFF, imagesize);
@@ -789,7 +789,7 @@ int DetectorImpl::InsertGapPixels(char *image, char *&gpImage, bool quadEnable,
                   << "nMod1TotPixelsx: " << nMod1TotPixelsx << "\n\t"
                   << "divisionValue: " << divisionValue << "\n\n";
 
-    if (gpImage == NULL) {
+    if (gpImage == nullptr) {
         gpImage = new char[imagesize];
     }
     memset(gpImage, 0xFF, imagesize);
diff --git a/slsSupportLib/src/UdpRxSocket.cpp b/slsSupportLib/src/UdpRxSocket.cpp
index 8f4b0afa5..280a370e9 100644
--- a/slsSupportLib/src/UdpRxSocket.cpp
+++ b/slsSupportLib/src/UdpRxSocket.cpp
@@ -22,7 +22,7 @@ UdpRxSocket::UdpRxSocket(int port, ssize_t packet_size, const char *hostname,
     hints.ai_socktype = SOCK_DGRAM;
     hints.ai_protocol = 0;
     hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-    struct addrinfo *res = 0;
+    struct addrinfo *res = nullptr;
 
     const std::string portname = std::to_string(port);
     if (getaddrinfo(hostname, portname.c_str(), &hints, &res)) {
diff --git a/slsSupportLib/src/network_utils.cpp b/slsSupportLib/src/network_utils.cpp
index 907ce7200..cca34c3e5 100644
--- a/slsSupportLib/src/network_utils.cpp
+++ b/slsSupportLib/src/network_utils.cpp
@@ -129,12 +129,12 @@ IpAddr InterfaceNameToIp(const std::string &ifn) {
         return {};
     }
 
-    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-        if (ifa->ifa_addr == NULL)
+    for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
+        if (ifa->ifa_addr == nullptr)
             continue;
 
         auto s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
-                             NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+                             NI_MAXHOST, nullptr, 0, NI_NUMERICHOST);
 
         if ((strcmp(ifa->ifa_name, ifn.c_str()) == 0) &&
             (ifa->ifa_addr->sa_family == AF_INET)) {