diff --git a/mainloop.cpp b/mainloop.cpp
index 99c8020..37c2316 100644
--- a/mainloop.cpp
+++ b/mainloop.cpp
@@ -287,8 +287,8 @@
 {
     // Get list of return codes for removing sensors on device
     std::string deviceRmRCs;
-    auto devRmRCs = getenv("REMOVERCS");
-    if (devRmRCs)
+    auto devRmRCs = env::getEnv("REMOVERCS");
+    if (!devRmRCs.empty())
     {
         deviceRmRCs.assign(devRmRCs);
     }
@@ -534,10 +534,10 @@
     }
 
     {
-        auto interval = getenv("INTERVAL");
-        if (interval)
+        auto interval = env::getEnv("INTERVAL");
+        if (!interval.empty())
         {
-            _interval = strtoull(interval, NULL, 10);
+            _interval = strtoull(interval.c_str(), NULL, 10);
         }
     }
 }