diff --git a/lib/guard/jasmine-headless-webkit.rb b/lib/guard/jasmine-headless-webkit.rb
index 85d9977..6dcee90 100644
--- a/lib/guard/jasmine-headless-webkit.rb
+++ b/lib/guard/jasmine-headless-webkit.rb
@@ -72,11 +72,10 @@ module Guard
       else
         UI.info(SOME_SPECS_MESSAGE % paths.join(' '))
       end
-      if failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options)
-        failed_files = @files_to_rerun = failed_files.is_a?(Array) ? failed_files : []
-      end
-
-      failed_files && failed_files.empty?
+      failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options)
+      @files_to_rerun = failed_files || paths
+      
+      failed_files && @files_to_rerun.empty?
     end
 
     def filter_paths(paths)
diff --git a/lib/guard/jasmine-headless-webkit/runner.rb b/lib/guard/jasmine-headless-webkit/runner.rb
index 211b011..6913564 100644
--- a/lib/guard/jasmine-headless-webkit/runner.rb
+++ b/lib/guard/jasmine-headless-webkit/runner.rb
@@ -24,6 +24,7 @@ module Guard
         end
       rescue Jasmine::Headless::InvalidReport => e
         Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
+        false
       rescue Exception => e
         p e
       end
diff --git a/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb b/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
index e01b0b8..a0bac69 100644
--- a/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
+++ b/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb
@@ -49,7 +49,7 @@ REPORT
       it 'should notify failure' do
         Guard::Notifier.expects(:notify).with("Spec runner interrupted!", { :title => 'Jasmine results', :image => :failed })
 
-        Guard::JasmineHeadlessWebkitRunner.notify(file).should be_nil
+        Guard::JasmineHeadlessWebkitRunner.notify(file).should be_false
       end
     end
   end