diff --git a/ola/AutoStart.cpp b/ola/AutoStart.cpp
index 89fa51f115..4dbe20d317 100644
--- a/ola/AutoStart.cpp
+++ b/ola/AutoStart.cpp
@@ -110,11 +110,11 @@ TCPSocket *ConnectToServer(unsigned short port) {
     // Try to start the server, we pass --daemon (fork into background) and
     // --syslog (log to syslog).
     execlp("olad", "olad", "--daemon", "--syslog",
-#ifdef __FreeBSD__
-           reinterpret_cast<char*>(0));
+#if __cplusplus >= 201103L
+           nullptr);
 #else
            reinterpret_cast<char*>(NULL));
-#endif  // __FreeBSD__
+#endif  // __cplusplus >= 201103L
     OLA_WARN << "Failed to exec: " << strerror(errno);
     _exit(1);
   }