Yet another JS error reporting tweak
Merge branch 'dev'