correctly handle errors in marionette_js
Update symbols
Prepare for landing