diff --git a/modules/lang/cc/doctor.el b/modules/lang/cc/doctor.el
index 77a0ee9ba..3c3facd0f 100644
--- a/modules/lang/cc/doctor.el
+++ b/modules/lang/cc/doctor.el
@@ -7,9 +7,11 @@
 
 (when (require 'rtags nil t)
   ;; rtags
-  (let ((bins (cl-remove-if #'executable-find `(,rtags-rdm-binary-name ,rtags-rc-binary-name))))
-    (when (/= (length bins) 0)
-      (warn! "Couldn't find the rtag client and/or server programs %s. Disabling rtags support" bins))))
+  (when-let (bins (cl-remove-if #'rtags-executable-find
+                                (list rtags-rdm-binary-name
+                                      rtags-rc-binary-name)))
+    (warn! "Couldn't find the rtag client and/or server programs %s. Disabling rtags support"
+           bins)))
 
 ;; irony server
 (when (require 'irony nil t)