Bug 958757 capturing possible errors
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 958757
Merge pull request #1386 from erikvold/958757

Bug 958757 capturing possible errors r=@jsantell