diff --git a/lib/facter/swapfile_sizes_csv.rb b/lib/facter/swapfile_sizes_csv.rb
index cdb3414..2869b0f 100644
--- a/lib/facter/swapfile_sizes_csv.rb
+++ b/lib/facter/swapfile_sizes_csv.rb
@@ -25,7 +25,7 @@
 
     end
 
-    swapfile_csv = swap_file_array.join(',')
+    swapfile_csv = swap_file_array.join(',') unless swap_file_array.empty?
 
     Facter.add('swapfile_sizes_csv') do
       confine :kernel => 'Linux'
diff --git a/spec/unit/facter/swapfiles_fact_csv_spec.rb b/spec/unit/facter/swapfiles_fact_csv_spec.rb
index 0132d7b..447669c 100644
--- a/spec/unit/facter/swapfiles_fact_csv_spec.rb
+++ b/spec/unit/facter/swapfiles_fact_csv_spec.rb
@@ -25,5 +25,22 @@
       end
     end
 
+    context 'returns nil when no swapfiles' do
+      before do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        File.stubs(:exists?)
+        File.expects(:exists?).with('/proc/swaps').returns(true)
+        Facter::Util::Resolution.stubs(:exec)
+      end
+      it do
+        proc_swap_output = <<-EOS
+Filename        Type    Size  Used  Priority
+/dev/dm-2                               partition 16612860  0 -1
+        EOS
+        Facter::Util::Resolution.expects(:exec).with('cat /proc/swaps').returns(proc_swap_output)
+        expect(Facter.value(:swapfile_sizes_csv)).to eq(nil)
+      end
+    end
+
   end
 end