beginning of js error handling
Merge branch 'master' into initial-design