diff --git a/lib/facter/xcode_active_directory.rb b/lib/facter/xcode_active_directory.rb
index 275bf25..99937bb 100644
--- a/lib/facter/xcode_active_directory.rb
+++ b/lib/facter/xcode_active_directory.rb
@@ -4,12 +4,10 @@
     output = Facter::Util::Resolution.exec('/usr/bin/xcode-select -p')
     if $CHILD_STATUS.exitstatus.nonzero?
       nil
+    elsif File.exist?(output.to_s.strip)
+      output
     else
-      if File.exist?(output.to_s.strip)
-        output
-      else
-        nil
-      end
+      nil
     end
   end
 end
diff --git a/lib/facter/xcode_command_line_tools.rb b/lib/facter/xcode_command_line_tools.rb
index 3e81345..b0b45ba 100644
--- a/lib/facter/xcode_command_line_tools.rb
+++ b/lib/facter/xcode_command_line_tools.rb
@@ -1,7 +1,9 @@
 Facter.add(:xcode_command_line_tools) do
   confine kernel: 'Darwin'
   setcode do
-    if Facter.value(:xcode_active_directory).include? '.app'
+    if Facter.value(:xcode_active_directory).nil?
+      false
+    elsif Facter.value(:xcode_active_directory).include? '.app'
       true
     else
       false