diff --git a/CHANGELOG b/CHANGELOG
index e4d3558..c3d6879 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v0.4.0:
+  date: 2013-03-08
+  changes:
+    - bumped grunt-lib-phantomjs to 0.2.0/1.8
+    - allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http)
+    - merged #30
+    - merged #34
 v0.3.3:
   date: 2013-02-24
   changes:
diff --git a/Gruntfile.js b/Gruntfile.js
index de8b8cb..d31d810 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -54,7 +54,6 @@ module.exports = function(grunt) {
 
   grunt.loadTasks('tasks');
 
-  grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-nodeunit');
   grunt.loadNpmTasks('grunt-contrib-internal');
diff --git a/README.md b/README.md
index 43e1496..7067b0a 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,7 @@ for more information on the RequireJS template.
 
 ## Release History
 
+ * 2013-03-07   v0.4.0   bumped grunt-lib-phantomjs to 0.2.0/1.8 allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http) merged merged
  * 2013-02-23   v0.3.3   Added better console output (via Gabor Kiss @Neverl)
  * 2013-02-16   v0.3.2   Ensure Gruntfile.js is included on npm.
  * 2013-02-14   v0.3.1   First official release for Grunt 0.4.0.
@@ -228,4 +229,4 @@ for more information on the RequireJS template.
 
 Task submitted by [Jarrod Overson](http://jarrodoverson.com)
 
-*This file was generated on Fri Mar 08 2013 17:16:32.*
+*This file was generated on Sun Mar 10 2013 21:41:54.*
diff --git a/package.json b/package.json
index 726115f..7ff1bf1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-contrib-jasmine",
   "description": "Run jasmine specs headlessly through PhantomJS.",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "homepage": "https://github.com/gruntjs/grunt-contrib-jasmine",
   "author": {
     "name": "Grunt Team",
diff --git a/tasks/jasmine.js b/tasks/jasmine.js
index a388d43..9bb3617 100644
--- a/tasks/jasmine.js
+++ b/tasks/jasmine.js
@@ -126,7 +126,7 @@ module.exports = function(grunt) {
     phantomjs.on('write', grunt.log.write.bind(grunt.log));
     phantomjs.on('writeln', grunt.log.writeln.bind(grunt.log));
     phantomjs.on('error.onError',function(string, trace){
-      if (trace) {
+      if (trace && trace.length) {
         grunt.log.error(string.red + ' at ');
         trace.forEach(function(line) {
           var file = line.file.replace(/^file:/,'');
diff --git a/tasks/lib/jasmine.js b/tasks/lib/jasmine.js
index 3633281..29731e6 100644
--- a/tasks/lib/jasmine.js
+++ b/tasks/lib/jasmine.js
@@ -95,7 +95,7 @@ exports.init = function(grunt, phantomjs) {
     var base = path.resolve(baseDir);
     var files = [];
     list.forEach(function(listItem){
-      if (listItem) files = files.concat(grunt.file.expand({filter: 'isFile'},listItem));
+      if (listItem) files = files.concat(grunt.file.expand({nonull: true},listItem));
     });
     files = grunt.util._(files).map(function(file){
       return path.resolve(file).replace(base,'.').replace(/\\/g,'/');