Merge pull request #228 from rwjblue/stefanpenner-patch-1

[FIXES #227]
emberjs · Jun 2, 2016 · 47d930c · 47d930c
2 parents 1d6281d + 9bc6d11
commit 47d930c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ember-qunit/test-wrapper.js b/lib/ember-qunit/test-wrapper.js
@@ -16,7 +16,7 @@ export default function testWrapper(qunit /*, testName, expected, callback, asyn
       var message;
       if (reason instanceof Error) {
         message = reason.stack;
-        if (reason.message && message.indexOf(reason.message) < 0) {
+        if (reason.message && message && message.indexOf(reason.message) < 0) {
           // PhantomJS has a `stack` that does not contain the actual
           // exception message.
           message = Ember.inspect(reason) + "\n" + message;