Move return into catch block
Merge branch 'master' of github.com:firebug/firebug.next