diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 3e8a1f7..fb4e36c 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -525,8 +525,8 @@
             fd = bpf_prog_load(cs[i].type, cs[i].name.c_str(), (struct bpf_insn*)cs[i].data.data(),
                                cs[i].data.size(), license.c_str(), kvers, 0,
                                log_buf.data(), log_buf.size());
-            ALOGD("bpf_prog_load lib call for %s (%s) returned: %d (%s)\n", elfPath,
-                  cs[i].name.c_str(), fd, std::strerror(errno));
+            ALOGD("bpf_prog_load lib call for %s (%s) returned fd: %d (%s)\n", elfPath,
+                  cs[i].name.c_str(), fd, (fd < 0 ? std::strerror(errno) : "no error"));
 
             if (fd <= 0)
                 ALOGE("bpf_prog_load: log_buf contents: %s\n", (char *)log_buf.data());
