Made console error handling more robust.
Merge branch 'core'